[NFC] SIL: Typed alloc_box's hasPointerEscape.

Author: nate-chandler

include/swift/SIL/SILBuilder.h

@@ -481,7 +481,7 @@ class SILBuilder {
       bool reflection = false,
       UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
           DoesNotUseMoveableValueDebugInfo,
-      bool hasPointerEscape = false) {
+      HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape) {
     return createAllocBox(loc, SILBoxType::get(fieldType.getASTType()), Var,
                           hasDynamicLifetime, reflection,
                           usesMoveableValueDebugInfo,
@@ -496,7 +496,8 @@ class SILBuilder {
       bool reflection = false,
       UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
           DoesNotUseMoveableValueDebugInfo,
-      bool skipVarDeclAssert = false, bool hasPointerEscape = false) {
+      bool skipVarDeclAssert = false,
+      HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape) {
 #if NDEBUG
     (void)skipVarDeclAssert;
 #endif

include/swift/SIL/SILInstruction.h

@@ -1978,6 +1978,11 @@ enum IsLexical_t : bool {
   IsLexical = true,
 };
 
+enum HasPointerEscape_t : bool {
+  DoesNotHavePointerEscape = false,
+  HasPointerEscape = true,
+};
+
 /// AllocStackInst - This represents the allocation of an unboxed (i.e., no
 /// reference count) stack memory.  The memory is provided uninitialized.
 class AllocStackInst final
@@ -2448,14 +2453,14 @@ class AllocBoxInst final
                HasDynamicLifetime_t hasDynamicLifetime, bool reflection = false,
                UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
                    DoesNotUseMoveableValueDebugInfo,
-               bool hasPointerEscape = false);
+               HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape);
 
   static AllocBoxInst *create(
       SILDebugLocation Loc, CanSILBoxType boxType, SILFunction &F,
       std::optional<SILDebugVariable> Var,
       HasDynamicLifetime_t hasDynamicLifetime, bool reflection = false,
       UsesMoveableValueDebugInfo_t wasMoved = DoesNotUseMoveableValueDebugInfo,
-      bool hasPointerEscape = false);
+      HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape);
 
 public:
   CanSILBoxType getBoxType() const {
@@ -2474,8 +2479,8 @@ class AllocBoxInst final
     sharedUInt8().AllocBoxInst.pointerEscape = pointerEscape;
   }
 
-  bool hasPointerEscape() const {
-    return sharedUInt8().AllocBoxInst.pointerEscape;
+  HasPointerEscape_t hasPointerEscape() const {
+    return HasPointerEscape_t(sharedUInt8().AllocBoxInst.pointerEscape);
   }
 
   /// True if the box should be emitted with reflection metadata for its

lib/SIL/IR/SILInstructions.cpp

@@ -397,7 +397,7 @@ AllocBoxInst::AllocBoxInst(
     std::optional<SILDebugVariable> Var,
     HasDynamicLifetime_t hasDynamicLifetime, bool reflection,
     UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo,
-    bool hasPointerEscape)
+    HasPointerEscape_t hasPointerEscape)
     : NullaryInstructionWithTypeDependentOperandsBase(
           Loc, TypeDependentOperands, SILType::getPrimitiveObjectType(BoxType)),
       VarInfo(Var, getTrailingObjects<char>()) {
@@ -414,15 +414,15 @@ AllocBoxInst::AllocBoxInst(
   sharedUInt8().AllocBoxInst.usesMoveableValueDebugInfo =
       (bool)usesMoveableValueDebugInfo;
 
-  sharedUInt8().AllocBoxInst.pointerEscape = hasPointerEscape;
+  sharedUInt8().AllocBoxInst.pointerEscape = (bool)hasPointerEscape;
 }
 
 AllocBoxInst *
 AllocBoxInst::create(SILDebugLocation Loc, CanSILBoxType BoxType,
                      SILFunction &F, std::optional<SILDebugVariable> Var,
                      HasDynamicLifetime_t hasDynamicLifetime, bool reflection,
                      UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo,
-                     bool hasPointerEscape) {
+                     HasPointerEscape_t hasPointerEscape) {
   SmallVector<SILValue, 8> TypeDependentOperands;
   collectTypeDependentOperands(TypeDependentOperands, F, BoxType);
   auto Sz = totalSizeToAlloc<swift::Operand, char>(TypeDependentOperands.size(),

lib/SIL/Parser/ParseSIL.cpp

@@ -2608,7 +2608,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
     bool hasReflection = false;
     UsesMoveableValueDebugInfo_t usesMoveableValueDebugInfo =
         DoesNotUseMoveableValueDebugInfo;
-    bool hasPointerEscape = false;
+    auto hasPointerEscape = DoesNotHavePointerEscape;
     StringRef attrName;
     SourceLoc attrLoc;
     while (parseSILOptional(attrName, attrLoc, *this)) {
@@ -2619,7 +2619,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
       } else if (attrName.equals("moveable_value_debuginfo")) {
         usesMoveableValueDebugInfo = UsesMoveableValueDebugInfo;
       } else if (attrName.equals("pointer_escape")) {
-        hasPointerEscape = true;
+        hasPointerEscape = HasPointerEscape;
       } else {
         P.diagnose(attrLoc, diag::sil_invalid_attribute_for_expected, attrName,
                    "dynamic_lifetime, reflection, pointer_escape or "

lib/Serialization/DeserializeSIL.cpp

@@ -1382,7 +1382,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     bool reflection = (Attr >> 1) & 0x1;
     auto usesMoveableValueDebugInfo =
         UsesMoveableValueDebugInfo_t((Attr >> 2) & 0x1);
-    bool pointerEscape = (Attr >> 3) & 0x1;
+    auto pointerEscape = HasPointerEscape_t((Attr >> 3) & 0x1);
     ResultInst = Builder.createAllocBox(
         Loc, cast<SILBoxType>(MF->getType(TyID)->getCanonicalType()),
         std::nullopt, hasDynamicLifetime, reflection,