[NFC] SIL: Typed begin_borrow's hasPointerEscape.

Author: nate-chandler

include/swift/SIL/SILBuilder.h

@@ -823,11 +823,10 @@ class SILBuilder {
                       LoadBorrowInst(getSILDebugLocation(Loc), LV));
   }
 
-  BeginBorrowInst *createBeginBorrow(SILLocation Loc, SILValue LV,
-                                     IsLexical_t isLexical = IsNotLexical,
-                                     bool hasPointerEscape = false,
-                                     bool fromVarDecl = false,
-                                     bool fixed = false) {
+  BeginBorrowInst *createBeginBorrow(
+      SILLocation Loc, SILValue LV, IsLexical_t isLexical = IsNotLexical,
+      HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape,
+      bool fromVarDecl = false, bool fixed = false) {
     assert(getFunction().hasOwnership());
     assert(!LV->getType().isAddress());
     return insert(new (getModule())
@@ -851,10 +850,10 @@ class SILBuilder {
     return createLoadBorrow(loc, v);
   }
 
-  SILValue emitBeginBorrowOperation(SILLocation loc, SILValue v,
-                                    IsLexical_t isLexical = IsNotLexical,
-                                    bool hasPointerEscape = false,
-                                    bool fromVarDecl = false) {
+  SILValue emitBeginBorrowOperation(
+      SILLocation loc, SILValue v, IsLexical_t isLexical = IsNotLexical,
+      HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape,
+      bool fromVarDecl = false) {
     if (!hasOwnership() ||
         v->getOwnershipKind().isCompatibleWith(OwnershipKind::Guaranteed))
       return v;

include/swift/SIL/SILInstruction.h

@@ -4564,7 +4564,7 @@ class BeginBorrowInst
   USE_SHARED_UINT8;
 
   BeginBorrowInst(SILDebugLocation DebugLoc, SILValue LValue,
-                  IsLexical_t isLexical, bool hasPointerEscape,
+                  IsLexical_t isLexical, HasPointerEscape_t hasPointerEscape,
                   bool fromVarDecl, bool fixed)
       : UnaryInstructionBase(DebugLoc, LValue,
                              LValue->getType().getObjectType()) {
@@ -4597,8 +4597,8 @@ class BeginBorrowInst
   }
 
   /// WARNING: this flag is not yet implemented!
-  bool hasPointerEscape() const {
-    return sharedUInt8().BeginBorrowInst.pointerEscape;
+  HasPointerEscape_t hasPointerEscape() const {
+    return HasPointerEscape_t(sharedUInt8().BeginBorrowInst.pointerEscape);
   }
   void setHasPointerEscape(bool pointerEscape) {
     sharedUInt8().BeginBorrowInst.pointerEscape = pointerEscape;

lib/SIL/Parser/ParseSIL.cpp

@@ -3741,7 +3741,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
     SourceLoc AddrLoc;
 
     auto isLexical = IsNotLexical;
-    bool hasPointerEscape = false;
+    auto hasPointerEscape = DoesNotHavePointerEscape;
     bool fromVarDecl = false;
     bool fixed = false;
 
@@ -3751,7 +3751,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
       if (AttrName == "lexical")
         isLexical = IsLexical;
       else if (AttrName == "pointer_escape")
-        hasPointerEscape = true;
+        hasPointerEscape = HasPointerEscape;
       else if (AttrName == "var_decl")
         fromVarDecl = true;
       else if (AttrName == "fixed")

lib/SILGen/SILGenBuilder.cpp

@@ -1107,8 +1107,8 @@ ManagedValue SILGenBuilder::createBeginBorrow(SILLocation loc,
                                               IsLexical_t isLexical,
                                               bool isFixed) {
   auto *newValue =
-      SILBuilder::createBeginBorrow(loc, value.getValue(),
-                                    isLexical, false, false, isFixed);
+      SILBuilder::createBeginBorrow(loc, value.getValue(), isLexical,
+                                    DoesNotHavePointerEscape, false, isFixed);
   SGF.emitManagedBorrowedRValueWithCleanup(newValue);
   return ManagedValue::forBorrowedObjectRValue(newValue);
 }
@@ -1118,8 +1118,8 @@ ManagedValue SILGenBuilder::createFormalAccessBeginBorrow(SILLocation loc,
                                                           IsLexical_t isLexical,
                                                           bool isFixed) {
   auto *newValue =
-      SILBuilder::createBeginBorrow(loc, value.getValue(),
-                                    isLexical, false, false, isFixed);
+      SILBuilder::createBeginBorrow(loc, value.getValue(), isLexical,
+                                    DoesNotHavePointerEscape, false, isFixed);
   return SGF.emitFormalEvaluationManagedBorrowedRValueWithCleanup(loc,
                                                     value.getValue(), newValue);
 }

lib/SILGen/SILGenDecl.cpp

@@ -573,7 +573,7 @@ class LocalVariableInitialization : public SingleBufferInitialization {
       // requires one.
       Box = SGF.B.createBeginBorrow(
           decl, Box, IsLexical_t(lifetime.isLexical()),
-          /*hasPointerEscape=*/false, /*fromVarDecl=*/true);
+          DoesNotHavePointerEscape, /*fromVarDecl=*/true);
     }
 
     Addr = SGF.B.createProjectBox(decl, Box, 0);
@@ -864,7 +864,7 @@ class LetValueInitialization : public Initialization {
                                    /*fromVarDecl=*/true);
 
     return SGF.B.createBeginBorrow(PrologueLoc, value, isLexical,
-                                   /*hasPointerEscape=*/false,
+                                   DoesNotHavePointerEscape,
                                    /*fromVarDecl=*/true);
   }
 

lib/SILGen/SILGenLValue.cpp

@@ -984,9 +984,8 @@ namespace {
       case ExistentialRepresentation::Opaque:
         if (!base.getValue()->getType().isAddress()) {
           assert(!SGF.useLoweredAddresses());
-          auto borrow =
-              SGF.B.createBeginBorrow(loc, base.getValue(), IsNotLexical,
-                                      /*hasPointerEscape=*/false);
+          auto borrow = SGF.B.createBeginBorrow(
+              loc, base.getValue(), IsNotLexical, DoesNotHavePointerEscape);
           auto value =
               SGF.B.createOpenExistentialValue(loc, borrow, getTypeOfRValue());
 

lib/Serialization/DeserializeSIL.cpp

@@ -2270,7 +2270,7 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
   case SILInstructionKind::BeginBorrowInst: {
     assert(RecordKind == SIL_ONE_OPERAND && "Layout should be OneOperand.");
     auto isLexical = IsLexical_t(Attr & 0x1);
-    bool hasPointerEscape = (Attr >> 1) & 0x1;
+    auto hasPointerEscape = HasPointerEscape_t((Attr >> 1) & 0x1);
     bool fromVarDecl = (Attr >> 2) & 0x1;
     bool isFixed = (Attr >> 3) & 0x1;
     ResultInst = Builder.createBeginBorrow(