IRGen: Fix another out-of-order task_dealloc with parameter pack metadata

Author: slavapestov

lib/IRGen/GenPack.cpp

@@ -195,7 +195,8 @@ irgen::emitPackArchetypeMetadataRef(IRGenFunction &IGF,
 
 static Address emitFixedSizeMetadataPackRef(IRGenFunction &IGF,
                                             CanPackType packType,
-                                            DynamicMetadataRequest request) {
+                                            DynamicMetadataRequest request,
+                                            llvm::ConstantInt *constantInt) {
   assert(!packType->containsPackExpansionType());
 
   unsigned elementCount = packType->getNumElements();
@@ -206,6 +207,10 @@ static Address emitFixedSizeMetadataPackRef(IRGenFunction &IGF,
   IGF.Builder.CreateLifetimeStart(pack,
                               IGF.IGM.getPointerSize() * elementCount);
 
+  // Record this before making recursive calls to emitTypeMetadataRef(),
+  // to ensure we maintain correct stack discipline.
+  IGF.recordStackPackMetadataAlloc(pack, constantInt);
+
   for (unsigned i : indices(packType->getElementTypes())) {
     Address slot = IGF.Builder.CreateStructGEP(
         pack, i, IGF.IGM.getPointerSize());
@@ -461,8 +466,8 @@ irgen::emitTypeMetadataPack(IRGenFunction &IGF, CanPackType packType,
   if (auto *constantInt = dyn_cast<llvm::ConstantInt>(shape)) {
     assert(packType->getNumElements() == constantInt->getValue());
     auto pack =
-        StackAddress(emitFixedSizeMetadataPackRef(IGF, packType, request));
-    IGF.recordStackPackMetadataAlloc(pack, constantInt);
+        StackAddress(emitFixedSizeMetadataPackRef(IGF, packType, request,
+                                                  constantInt));
     return {pack, constantInt};
   }
 
@@ -471,6 +476,10 @@ irgen::emitTypeMetadataPack(IRGenFunction &IGF, CanPackType packType,
                                     IGF.IGM.getPointerAlignment(),
                                     /*allowTaskAlloc=*/true);
 
+  // Record this before making recursive calls to emitTypeMetadataRef(),
+  // to ensure we maintain correct stack discipline.
+  IGF.recordStackPackMetadataAlloc(pack, shape);
+
   auto visitFn =
     [&](CanType eltTy, unsigned staticIndex,
         llvm::Value *dynamicIndex,
@@ -497,7 +506,6 @@ irgen::emitTypeMetadataPack(IRGenFunction &IGF, CanPackType packType,
     };
 
   visitPackExplosion(IGF, packType, visitFn);
-  IGF.recordStackPackMetadataAlloc(pack, shape);
 
   return {pack, shape};
 }
@@ -537,7 +545,8 @@ irgen::emitTypeMetadataPackRef(IRGenFunction &IGF, CanPackType packType,
 
 static Address emitFixedSizeWitnessTablePack(IRGenFunction &IGF,
                                              CanPackType packType,
-                                             PackConformance *packConformance) {
+                                             PackConformance *packConformance,
+                                             llvm::ConstantInt *constantInt) {
   assert(!packType->containsPackExpansionType());
 
   unsigned elementCount = packType->getNumElements();
@@ -548,6 +557,10 @@ static Address emitFixedSizeWitnessTablePack(IRGenFunction &IGF,
   IGF.Builder.CreateLifetimeStart(pack,
                                   IGF.IGM.getPointerSize() * elementCount);
 
+  // Record this before making recursive calls to emitTypeMetadataRef(),
+  // to ensure we maintain correct stack discipline.
+  IGF.recordStackPackWitnessTableAlloc(pack, constantInt);
+
   for (unsigned i : indices(packType->getElementTypes())) {
     Address slot =
         IGF.Builder.CreateStructGEP(pack, i, IGF.IGM.getPointerSize());
@@ -607,8 +620,7 @@ irgen::emitWitnessTablePack(IRGenFunction &IGF, CanPackType packType,
   if (auto *constantInt = dyn_cast<llvm::ConstantInt>(shape)) {
     assert(packType->getNumElements() == constantInt->getValue());
     auto pack = StackAddress(
-        emitFixedSizeWitnessTablePack(IGF, packType, packConformance));
-    IGF.recordStackPackWitnessTableAlloc(pack, constantInt);
+        emitFixedSizeWitnessTablePack(IGF, packType, packConformance, constantInt));
     return {pack, constantInt};
   }
 
@@ -617,6 +629,10 @@ irgen::emitWitnessTablePack(IRGenFunction &IGF, CanPackType packType,
                                     IGF.IGM.getPointerAlignment(),
                                     /*allowTaskAlloc=*/true);
 
+  // Record this before making recursive calls to emitTypeMetadataRef(),
+  // to ensure we maintain correct stack discipline.
+  IGF.recordStackPackWitnessTableAlloc(pack, shape);
+
   auto index = 0;
   auto visitFn = [&](CanType eltTy, unsigned staticIndex,
                      llvm::Value *dynamicIndex, llvm::Value *dynamicLength) {
@@ -645,7 +661,6 @@ irgen::emitWitnessTablePack(IRGenFunction &IGF, CanPackType packType,
   };
 
   visitPackExplosion(IGF, packType, visitFn);
-  IGF.recordStackPackWitnessTableAlloc(pack, shape);
 
   return {pack, shape};
 }
@@ -1437,6 +1452,11 @@ irgen::emitInducedTupleTypeMetadataPack(
   auto pack = IGF.emitDynamicAlloca(IGF.IGM.TypeMetadataPtrTy, shape,
                                     IGF.IGM.getPointerAlignment(),
                                     /*allowTaskAlloc=*/true);
+
+  // Record this before making recursive calls to emitTypeMetadataRef(),
+  // to ensure we maintain correct stack discipline.
+  IGF.recordStackPackMetadataAlloc(pack, shape);
+
   auto elementForIndex =
     [&](llvm::Value *index) -> llvm::Value * {
       return irgen::emitTupleTypeMetadataElementType(IGF, tupleMetadata, index);
@@ -1446,8 +1466,6 @@ irgen::emitInducedTupleTypeMetadataPack(
   emitPackExpansionPack(IGF, pack.getAddress(), index, shape,
                         elementForIndex);
 
-  IGF.recordStackPackMetadataAlloc(pack, shape);
-
   return {pack, shape};
 }