---

yaml
---
r: 311293
b: refs/heads/tensorflow-merge
c: 3da2822
h: refs/heads/master
i:
  311291: 43dc3f4

Author: lattner

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: 5b55ab10b6ba44265ec2652a018303a37bf0e070
+refs/heads/tensorflow-merge: 3da28223a7f04660946a1849b3c48c49e5854894
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/include/swift/SIL/SILConstants.h

@@ -29,7 +29,6 @@ class SerializedSILLoader;
 struct APIntSymbolicValue;
 struct APFloatSymbolicValue;
 struct StringSymbolicValue;
-struct AddressSymbolicValue;
 struct AggregateSymbolicValue;
 
 /// When we fail to constant fold a value, this captures a reason why,
@@ -97,12 +96,6 @@ class SymbolicValue {
     /// representing a UTF-8 encoded string.
     RK_String,
 
-    /// This value is a pointer to a tracked memory location, along with zero
-    /// or more indices (tuple indices, struct field indices, etc) into the
-    /// value if it is an aggregate.
-    ///
-    RK_Address,
-
     /// This value is an array, struct, or tuple of constants.  This is
     /// tracked by the "aggregate" member of the value union.  Note that we
     /// cheat and represent single-element structs as the value of their
@@ -143,10 +136,6 @@ class SymbolicValue {
     /// information about the StringRef value it holds.
     StringSymbolicValue *string;
 
-    /// When this SymbolicValue is of "Address" kind, this pointer stores
-    /// info about the base and the indices for the address.
-    AddressSymbolicValue *address;
-
     /// When this SymbolicValue is of "Aggregate" kind, this pointer stores
     /// information about the array elements, count, and element type.
     AggregateSymbolicValue *aggregate;
@@ -196,7 +185,6 @@ class SymbolicValue {
 
     /// These values are generally only seen internally to the system, external
     /// clients shouldn't have to deal with them.
-    Address,
     UninitMemory
   };
 
@@ -218,6 +206,10 @@ class SymbolicValue {
     return result;
   }
 
+  bool isUnknown() const {
+    return getKind() == Unknown;
+  }
+
   /// Return information about an unknown result, including the SIL node that
   /// is a problem, and the reason it is an issue.
   std::pair<SILNode *, UnknownReason> getUnknownValue() const {
@@ -303,22 +295,6 @@ class SymbolicValue {
   /// Returns the UTF-8 encoded string underlying a SymbolicValue.
   StringRef getStringValue() const;
 
-  /// Get a SymbolicValue corresponding to a memory object with an optional
-  /// list of indices into it.  This is used by (e.g.) a struct_element_addr
-  /// of a stack_alloc.
-  static SymbolicValue getAddress(SILValue base,
-                                  ArrayRef<unsigned> indices,
-                                  llvm::BumpPtrAllocator &allocator);
-
-  /// Accessors for Address SymbolicValue's.
-  bool isAddress() const {
-    return getKind() == Address;
-  }
-
-  SILValue getAddressBase() const;
-  ArrayRef<unsigned> getAddressIndices() const;
-
-
   /// This returns an aggregate value with the specified elements in it.  This
   /// copies the elements into the specified allocator.
   static SymbolicValue getAggregate(ArrayRef<SymbolicValue> elements,

branches/tensorflow-merge/lib/SIL/SILConstants.cpp

@@ -70,13 +70,6 @@ void SymbolicValue::print(llvm::raw_ostream &os, unsigned indent) const {
   case RK_String:
     os << "string: \"" << getStringValue() << "\"\n";
     return;
-  case RK_Address: {
-    os << "address indices = [";
-    interleave(getAddressIndices(), [&](unsigned idx) { os << idx; },
-               [&]() { os << ", "; });
-    os << "]:  " << getAddressBase();
-    return;
-  }
   case RK_Aggregate: {
     ArrayRef<SymbolicValue> elements = getAggregateValue();
     if (elements.empty()) {
@@ -109,7 +102,6 @@ SymbolicValue::Kind SymbolicValue::getKind() const {
   case RK_Unknown:      return Unknown;
   case RK_Metatype:     return Metatype;
   case RK_Function:     return Function;
-  case RK_Address:      return Address;
   case RK_Aggregate:    return Aggregate;
   case RK_Integer:      return Integer;
   case RK_Float:        return Float;
@@ -336,74 +328,6 @@ StringRef SymbolicValue::getStringValue() const {
   return cast<StringLiteralInst>(value.inst)->getValue();
 }
 
-//===----------------------------------------------------------------------===//
-// Addresses
-//===----------------------------------------------------------------------===//
-
-namespace swift {
-/// This is a representation of an address value, stored as a base pointer plus
-/// trailing array of indices.  Elements of this value are bump-pointer
-/// allocated.
-struct alignas(SILValue) AddressSymbolicValue final
-  : private llvm::TrailingObjects<AddressSymbolicValue, unsigned> {
-    friend class llvm::TrailingObjects<AddressSymbolicValue, unsigned>;
-
-  /// The number of words in the trailing array and # bits of the value.
-  const SILValue base;
-  const unsigned numIndices;
-
-  static AddressSymbolicValue *create(SILValue base, ArrayRef<unsigned> indices,
-                                      llvm::BumpPtrAllocator &allocator) {
-    auto byteSize =
-      AddressSymbolicValue::totalSizeToAlloc<unsigned>(indices.size());
-    auto rawMem = allocator.Allocate(byteSize, alignof(AddressSymbolicValue));
-
-    //  Placement initialize the AddressSymbolicValue.
-    auto alv = ::new (rawMem) AddressSymbolicValue(base, indices.size());
-    std::uninitialized_copy(indices.begin(), indices.end(),
-                            alv->getTrailingObjects<unsigned>());
-    return alv;
-  }
-
-  ArrayRef<unsigned> getIndices() const {
-    return { getTrailingObjects<unsigned>(), numIndices };
-  }
-
-  // This is used by the llvm::TrailingObjects base class.
-  size_t numTrailingObjects(OverloadToken<unsigned>) const {
-    return numIndices;
-  }
-private:
-  AddressSymbolicValue() = delete;
-  AddressSymbolicValue(const AddressSymbolicValue &) = delete;
-  AddressSymbolicValue(SILValue base, unsigned numIndices)
-    : base(base), numIndices(numIndices) {}
-};
-} // end namespace swift
-
-
-SymbolicValue
-SymbolicValue::getAddress(SILValue base, ArrayRef<unsigned> indices,
-                          llvm::BumpPtrAllocator &allocator) {
-  auto alv = AddressSymbolicValue::create(base, indices, allocator);
-  assert(alv && "aggregate value must be present");
-  SymbolicValue result;
-  result.representationKind = RK_Address;
-  result.value.address = alv;
-  return result;
-}
-
-SILValue SymbolicValue::getAddressBase() const {
-  assert(representationKind == RK_Address);
-  return value.address->base;
-}
-
-ArrayRef<unsigned> SymbolicValue::getAddressIndices() const {
-  assert(representationKind == RK_Address);
-  return value.address->getIndices();
-}
-
-
 //===----------------------------------------------------------------------===//
 // Aggregates
 //===----------------------------------------------------------------------===//

branches/tensorflow-merge/lib/SIL/SILPrinter.cpp

@@ -1227,7 +1227,6 @@ class SILPrinter : public SILInstructionVisitor<SILPrinter> {
       *this << "]";
       return;
     case SymbolicValue::Function:
-    case SymbolicValue::Address:
     case SymbolicValue::UninitMemory:
     case SymbolicValue::Unknown:
       llvm_unreachable("Unimplemented SymbolicValue case");