---

yaml
---
r: 323183
b: refs/heads/tensorflow-next
c: ec3470e
h: refs/heads/master
i:
  323181: 4349731
  323179: 9738e5d
  323175: 9305c2c
  323167: a6e2e61

Author: swift-ci

[refs]

@@ -1461,4 +1461,4 @@ refs/heads/master-rebranch: 86e95c23aa0d37f24ec138b7853146c1cead2e40
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
-refs/heads/tensorflow-next: ded2dcfa61c2a64aa9c8ce56debebb80d63f6c80
+refs/heads/tensorflow-next: ec3470ea6d66099759384a60fbd148544fe79d10

branches/tensorflow-next/lib/IRGen/StructLayout.cpp

@@ -78,7 +78,7 @@ StructLayout::StructLayout(IRGenModule &IGM,
   } else {
     MinimumAlign = builder.getAlignment();
     MinimumSize = builder.getSize();
-    SpareBits = std::move(builder.getSpareBits());
+    SpareBits = builder.getSpareBits();
     IsFixedLayout = builder.isFixedLayout();
     IsKnownPOD = builder.isPOD();
     IsKnownBitwiseTakable = builder.isBitwiseTakable();
@@ -263,9 +263,11 @@ void StructLayoutBuilder::addFixedSizeElement(ElementLayout &elt) {
     if (isFixedLayout()) {
       auto paddingTy = llvm::ArrayType::get(IGM.Int8Ty, paddingRequired);
       StructFields.push_back(paddingTy);
-      
+
       // The padding can be used as spare bits by enum layout.
-      CurSpareBits.appendSetBits(Size(paddingRequired).getValueInBits());
+      auto numBits = Size(paddingRequired).getValueInBits();
+      auto mask = llvm::APInt::getAllOnesValue(numBits);
+      CurSpareBits.push_back(SpareBitVector::fromAPInt(mask));
     }
   }
 
@@ -318,15 +320,15 @@ void StructLayoutBuilder::addElementAtFixedOffset(ElementLayout &elt) {
   StructFields.push_back(elt.getType().getStorageType());
 
   // Carry over the spare bits from the element.
-  CurSpareBits.append(eltTI.getSpareBits());
+  CurSpareBits.push_back(eltTI.getSpareBits());
 }
 
 /// Add an element at a non-fixed offset to the aggregate.
 void StructLayoutBuilder::addElementAtNonFixedOffset(ElementLayout &elt) {
   assert(!isFixedLayout());
   elt.completeNonFixed(elt.getType().isPOD(ResilienceExpansion::Maximal),
                        NextNonFixedOffsetIndex);
-  CurSpareBits.clear();
+  CurSpareBits = SmallVector<SpareBitVector, 8>(); // clear spare bits
 }
 
 /// Add a non-fixed-size element to the aggregate at offset zero.
@@ -335,7 +337,7 @@ void StructLayoutBuilder::addNonFixedSizeElementAtOffsetZero(ElementLayout &elt)
   assert(!isa<FixedTypeInfo>(elt.getType()));
   assert(CurSize.isZero());
   elt.completeInitialNonFixedSize(elt.getType().isPOD(ResilienceExpansion::Maximal));
-  CurSpareBits.clear();
+  CurSpareBits = SmallVector<SpareBitVector, 8>(); // clear spare bits
 }
 
 /// Produce the current fields as an anonymous structure.
@@ -358,3 +360,27 @@ void StructLayoutBuilder::setAsBodyOfStruct(llvm::StructType *type) const {
             == CurSize.getValue())
          && "LLVM size of fixed struct type does not match StructLayout size");
 }
+
+/// Return the spare bit mask of the structure built so far.
+SpareBitVector StructLayoutBuilder::getSpareBits() const {
+  // Calculate the size up front to reduce possible allocations.
+  unsigned numBits = 0;
+  for (auto &v : CurSpareBits) {
+    numBits += v.size();
+  }
+  if (numBits == 0) {
+    return SpareBitVector();
+  }
+  // Assemble the spare bit mask.
+  auto mask = llvm::APInt::getNullValue(numBits);
+  unsigned offset = 0;
+  for (auto &v : CurSpareBits) {
+    if (v.size() == 0) {
+      continue;
+    }
+    mask.insertBits(v.asAPInt(), offset);
+    offset += v.size();
+  }
+  assert(offset == numBits);
+  return SpareBitVector::fromAPInt(std::move(mask));
+}

branches/tensorflow-next/lib/IRGen/StructLayout.h

@@ -239,7 +239,7 @@ class StructLayoutBuilder {
   Size CurSize = Size(0);
 private:
   Alignment CurAlignment = Alignment(1);
-  SpareBitVector CurSpareBits;
+  SmallVector<SpareBitVector, 8> CurSpareBits;
   unsigned NextNonFixedOffsetIndex = 0;
   bool IsFixedLayout = true;
   IsPOD_t IsKnownPOD = IsPOD;
@@ -300,12 +300,9 @@ class StructLayoutBuilder {
 
   /// Return the alignment of the structure built so far.
   Alignment getAlignment() const { return CurAlignment; }
-  
-  /// Return the spare bit mask of the structure built so far.
-  const SpareBitVector &getSpareBits() const { return CurSpareBits; }
 
   /// Return the spare bit mask of the structure built so far.
-  SpareBitVector &getSpareBits() { return CurSpareBits; }
+  SpareBitVector getSpareBits() const;
 
   /// Build the current elements as a new anonymous struct type.
   llvm::StructType *getAsAnonStruct() const;