[NFC] SIL: Typed alloc_box's hasDynamicLifetime.

nate-chandler · nate-chandler · commit ec6b447b6882 · 2024-03-08T21:24:39.000-08:00
diff --git a/include/swift/SIL/SILBuilder.h b/include/swift/SIL/SILBuilder.h
@@ -474,28 +474,29 @@ class SILBuilder {
 
   /// Helper function that calls \p createAllocBox after constructing a
   /// SILBoxType for \p fieldType.
-  AllocBoxInst *
-  createAllocBox(SILLocation loc, SILType fieldType,
-                 std::optional<SILDebugVariable> Var = std::nullopt,
-                 bool hasDynamicLifetime = false, bool reflection = false,
-                 UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
-                     DoesNotUseMoveableValueDebugInfo,
-                 bool hasPointerEscape = false) {
+  AllocBoxInst *createAllocBox(
+      SILLocation loc, SILType fieldType,
+      std::optional<SILDebugVariable> Var = std::nullopt,
+      HasDynamicLifetime_t hasDynamicLifetime = DoesNotHaveDynamicLifetime,
+      bool reflection = false,
+      UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
+          DoesNotUseMoveableValueDebugInfo,
+      bool hasPointerEscape = false) {
     return createAllocBox(loc, SILBoxType::get(fieldType.getASTType()), Var,
                           hasDynamicLifetime, reflection,
                           usesMoveableValueDebugInfo,
                           /*skipVarDeclAssert*/ false,
                           hasPointerEscape);
   }
 
-  AllocBoxInst *
-  createAllocBox(SILLocation Loc, CanSILBoxType BoxType,
-                 std::optional<SILDebugVariable> Var = std::nullopt,
-                 bool hasDynamicLifetime = false, bool reflection = false,
-                 UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
-                     DoesNotUseMoveableValueDebugInfo,
-                 bool skipVarDeclAssert = false,
-                 bool hasPointerEscape = false) {
+  AllocBoxInst *createAllocBox(
+      SILLocation Loc, CanSILBoxType BoxType,
+      std::optional<SILDebugVariable> Var = std::nullopt,
+      HasDynamicLifetime_t hasDynamicLifetime = DoesNotHaveDynamicLifetime,
+      bool reflection = false,
+      UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
+          DoesNotUseMoveableValueDebugInfo,
+      bool skipVarDeclAssert = false, bool hasPointerEscape = false) {
 #if NDEBUG
     (void)skipVarDeclAssert;
 #endif
diff --git a/include/swift/SIL/SILCloner.h b/include/swift/SIL/SILCloner.h
@@ -970,7 +970,7 @@ SILCloner<ImplClass>::visitAllocBoxInst(AllocBoxInst *Inst) {
       Inst,
       getBuilder().createAllocBox(
           Loc, this->getOpType(Inst->getType()).template castTo<SILBoxType>(),
-          VarInfo, /*hasDynamicLifetime*/ false,
+          VarInfo, DoesNotHaveDynamicLifetime,
           /*reflection*/ false, DoesNotUseMoveableValueDebugInfo,
           /*skipVarDeclAssert*/ true));
 }
diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h
@@ -2433,16 +2433,16 @@ class AllocBoxInst final
 
   AllocBoxInst(SILDebugLocation DebugLoc, CanSILBoxType BoxType,
                ArrayRef<SILValue> TypeDependentOperands, SILFunction &F,
-               std::optional<SILDebugVariable> Var, bool hasDynamicLifetime,
-               bool reflection = false,
+               std::optional<SILDebugVariable> Var,
+               HasDynamicLifetime_t hasDynamicLifetime, bool reflection = false,
                UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
                    DoesNotUseMoveableValueDebugInfo,
                bool hasPointerEscape = false);
 
   static AllocBoxInst *create(
       SILDebugLocation Loc, CanSILBoxType boxType, SILFunction &F,
-      std::optional<SILDebugVariable> Var, bool hasDynamicLifetime,
-      bool reflection = false,
+      std::optional<SILDebugVariable> Var,
+      HasDynamicLifetime_t hasDynamicLifetime, bool reflection = false,
       UsesMoveableValueDebugInfo_t wasMoved = DoesNotUseMoveableValueDebugInfo,
       bool hasPointerEscape = false);
 
@@ -2452,11 +2452,11 @@ class AllocBoxInst final
   }
 
   void setDynamicLifetime() {
-    sharedUInt8().AllocBoxInst.dynamicLifetime = true;
+    sharedUInt8().AllocBoxInst.dynamicLifetime = (bool)HasDynamicLifetime;
   }
 
-  bool hasDynamicLifetime() const {
-    return sharedUInt8().AllocBoxInst.dynamicLifetime;
+  HasDynamicLifetime_t hasDynamicLifetime() const {
+    return HasDynamicLifetime_t(sharedUInt8().AllocBoxInst.dynamicLifetime);
   }
 
   void setHasPointerEscape(bool pointerEscape) {
diff --git a/lib/SIL/IR/SILInstructions.cpp b/lib/SIL/IR/SILInstructions.cpp
@@ -394,8 +394,9 @@ bool AllocRefDynamicInst::isDynamicTypeDeinitAndSizeKnownEquivalentToBaseType()
 AllocBoxInst::AllocBoxInst(
     SILDebugLocation Loc, CanSILBoxType BoxType,
     ArrayRef<SILValue> TypeDependentOperands, SILFunction &F,
-    std::optional<SILDebugVariable> Var, bool hasDynamicLifetime,
-    bool reflection, UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo,
+    std::optional<SILDebugVariable> Var,
+    HasDynamicLifetime_t hasDynamicLifetime, bool reflection,
+    UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo,
     bool hasPointerEscape)
     : NullaryInstructionWithTypeDependentOperandsBase(
           Loc, TypeDependentOperands, SILType::getPrimitiveObjectType(BoxType)),
@@ -419,7 +420,7 @@ AllocBoxInst::AllocBoxInst(
 AllocBoxInst *
 AllocBoxInst::create(SILDebugLocation Loc, CanSILBoxType BoxType,
                      SILFunction &F, std::optional<SILDebugVariable> Var,
-                     bool hasDynamicLifetime, bool reflection,
+                     HasDynamicLifetime_t hasDynamicLifetime, bool reflection,
                      UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo,
                      bool hasPointerEscape) {
   SmallVector<SILValue, 8> TypeDependentOperands;
diff --git a/lib/SIL/Parser/ParseSIL.cpp b/lib/SIL/Parser/ParseSIL.cpp
@@ -2604,7 +2604,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
 
   switch (Opcode) {
   case SILInstructionKind::AllocBoxInst: {
-    bool hasDynamicLifetime = false;
+    auto hasDynamicLifetime = DoesNotHaveDynamicLifetime;
     bool hasReflection = false;
     UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
         DoesNotUseMoveableValueDebugInfo;
@@ -2613,7 +2613,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
     SourceLoc attrLoc;
     while (parseSILOptional(attrName, attrLoc, *this)) {
       if (attrName.equals("dynamic_lifetime")) {
-        hasDynamicLifetime = true;
+        hasDynamicLifetime = HasDynamicLifetime;
       } else if (attrName.equals("reflection")) {
         hasReflection = true;
       } else if (attrName.equals("moveable_value_debuginfo")) {
diff --git a/lib/SILGen/SILGenDecl.cpp b/lib/SILGen/SILGenDecl.cpp
@@ -549,7 +549,7 @@ class LocalVariableInitialization : public SingleBufferInitialization {
     if (generateDebugInfo)
       DbgVar = SILDebugVariable(decl->isLet(), ArgNo);
     Box = SGF.B.createAllocBox(
-        decl, boxType, DbgVar, /*hasDynamicLifetime*/ false,
+        decl, boxType, DbgVar, DoesNotHaveDynamicLifetime,
         /*reflection*/ false, DoesNotUseMoveableValueDebugInfo,
         !generateDebugInfo);
 
diff --git a/lib/SILOptimizer/Transforms/AllocBoxToStack.cpp b/lib/SILOptimizer/Transforms/AllocBoxToStack.cpp
@@ -649,15 +649,14 @@ static bool rewriteAllocBoxAsAllocStack(AllocBoxInst *ABI) {
     }
     return false;
   };
-  auto *ASI =
-      Builder.createAllocStack(ABI->getLoc(), ty, ABI->getVarInfo(),
-                               HasDynamicLifetime_t(ABI->hasDynamicLifetime()),
-                               isLexical(), DoesNotUseMoveableValueDebugInfo
+  auto *ASI = Builder.createAllocStack(ABI->getLoc(), ty, ABI->getVarInfo(),
+                                       ABI->hasDynamicLifetime(), isLexical(),
+                                       DoesNotUseMoveableValueDebugInfo
 #ifndef NDEBUG
-                               ,
-                               true
+                                       ,
+                                       true
 #endif
-      );
+  );
 
   // Transfer a mark_uninitialized if we have one.
   SingleValueInstruction *StackBox = ASI;
diff --git a/lib/SILOptimizer/Transforms/PartialApplySimplification.cpp b/lib/SILOptimizer/Transforms/PartialApplySimplification.cpp
@@ -753,11 +753,10 @@ rewriteKnownCalleeWithExplicitContext(SILFunction *callee,
       // Continue emitting code to populate the context.
       B.setInsertionPoint(contextAlloc->getNextInstruction());
     } else {
-      contextBuffer =
-          B.createAllocBox(loc, contextStorageTy.castTo<SILBoxType>(),
-                           /*debug variable*/ std::nullopt,
-                           /*dynamic lifetime*/ false,
-                           /*reflection*/ true);
+      contextBuffer = B.createAllocBox(
+          loc, contextStorageTy.castTo<SILBoxType>(),
+          /*debug variable*/ std::nullopt, DoesNotHaveDynamicLifetime,
+          /*reflection*/ true);
       contextProj = B.createProjectBox(loc, contextBuffer, 0);
     }
     
diff --git a/lib/Serialization/DeserializeSIL.cpp b/lib/Serialization/DeserializeSIL.cpp
@@ -1378,7 +1378,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
 
   case SILInstructionKind::AllocBoxInst: {
     assert(RecordKind == SIL_ONE_TYPE && "Layout should be OneType.");
-    bool hasDynamicLifetime = Attr & 0x1;
+    auto hasDynamicLifetime = HasDynamicLifetime_t(Attr & 0x1);
     bool reflection = (Attr >> 1) & 0x1;
     auto usesMoveableValueDebugInfo =
         UsesMoveableValueDebugInfo_t((Attr >> 2) & 0x1);

Original file line number	Diff line number	Diff line change
`@@ -970,7 +970,7 @@ SILCloner<ImplClass>::visitAllocBoxInst(AllocBoxInst *Inst) {`
`970`	`970`	`Inst,`
`971`	`971`	`getBuilder().createAllocBox(`
`972`	`972`	`Loc, this->getOpType(Inst->getType()).template castTo<SILBoxType>(),`
`973`		`- VarInfo, /hasDynamicLifetime/ false,`
	`973`	`+ VarInfo, DoesNotHaveDynamicLifetime,`
`974`	`974`	`/reflection/ false, DoesNotUseMoveableValueDebugInfo,`
`975`	`975`	`/skipVarDeclAssert/ true));`
`976`	`976`	`}`