[NFC] SIL: Typed move_value's isFromVarDecl.

Author: nate-chandler

include/swift/SIL/SILBuilder.h

@@ -1429,7 +1429,7 @@ class SILBuilder {
   MoveValueInst *createMoveValue(
       SILLocation loc, SILValue operand, IsLexical_t isLexical = IsNotLexical,
       HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape,
-      bool fromVarDecl = false) {
+      IsFromVarDecl_t fromVarDecl = IsNotFromVarDecl) {
     assert(getFunction().hasOwnership());
     assert(!operand->getType().isTrivial(getFunction()) &&
            "Should not be passing trivial values to this api. Use instead "
@@ -2852,7 +2852,7 @@ class SILBuilder {
   SILValue emitMoveValueOperation(
       SILLocation Loc, SILValue v, IsLexical_t isLexical = IsNotLexical,
       HasPointerEscape_t hasPointerEscape = DoesNotHavePointerEscape,
-      bool fromVarDecl = false) {
+      IsFromVarDecl_t fromVarDecl = IsNotFromVarDecl) {
     assert(!v->getType().isAddress());
     if (v->getType().isTrivial(*getInsertionBB()->getParent()))
       return v;

include/swift/SIL/SILInstruction.h

@@ -8693,11 +8693,11 @@ class MoveValueInst
 
   MoveValueInst(SILDebugLocation DebugLoc, SILValue operand,
                 IsLexical_t isLexical, HasPointerEscape_t hasPointerEscape,
-                bool fromVarDecl)
+                IsFromVarDecl_t fromVarDecl)
       : UnaryInstructionBase(DebugLoc, operand, operand->getType()) {
     sharedUInt8().MoveValueInst.lexical = (bool)isLexical;
     sharedUInt8().MoveValueInst.pointerEscape = (bool)hasPointerEscape;
-    sharedUInt8().MoveValueInst.fromVarDecl = fromVarDecl;
+    sharedUInt8().MoveValueInst.fromVarDecl = (bool)fromVarDecl;
   }
 
 public:
@@ -8725,7 +8725,9 @@ class MoveValueInst
     sharedUInt8().MoveValueInst.pointerEscape = pointerEscape;
   }
 
-  bool isFromVarDecl() const { return sharedUInt8().MoveValueInst.fromVarDecl; }
+  IsFromVarDecl_t isFromVarDecl() const {
+    return IsFromVarDecl_t(sharedUInt8().MoveValueInst.fromVarDecl);
+  }
 };
 
 /// Drop the user-defined deinitializer from a struct or enum. Takes either an

lib/SIL/Parser/ParseSIL.cpp

@@ -3496,7 +3496,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
     bool allowsDiagnostics = false;
     auto isLexical = IsNotLexical;
     auto hasPointerEscape = DoesNotHavePointerEscape;
-    bool fromVarDecl = false;
+    auto fromVarDecl = IsNotFromVarDecl;
 
     StringRef AttrName;
     SourceLoc AttrLoc;
@@ -3508,7 +3508,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
       else if (AttrName == "pointer_escape")
         hasPointerEscape = HasPointerEscape;
       else if (AttrName == "var_decl")
-        fromVarDecl = true;
+        fromVarDecl = IsFromVarDecl;
       else {
         P.diagnose(InstLoc.getSourceLoc(),
                    diag::sil_invalid_attribute_for_instruction, AttrName,

lib/SILGen/SILGenDecl.cpp

@@ -842,8 +842,7 @@ class LetValueInitialization : public Initialization {
     // that the move checker knows to check this variable.
     if (vd->isNoImplicitCopy()) {
       value = SGF.B.createMoveValue(PrologueLoc, value, IsLexical,
-                                    DoesNotHavePointerEscape,
-                                    /*fromVarDecl=*/true);
+                                    DoesNotHavePointerEscape, IsFromVarDecl);
       value =
           SGF.B.createOwnedCopyableToMoveOnlyWrapperValue(PrologueLoc, value);
       return SGF.B.createMarkUnresolvedNonCopyableValueInst(
@@ -860,8 +859,7 @@ class LetValueInitialization : public Initialization {
 
     if (value->getOwnershipKind() == OwnershipKind::Owned)
       return SGF.B.createMoveValue(PrologueLoc, value, isLexical,
-                                   DoesNotHavePointerEscape,
-                                   /*fromVarDecl=*/true);
+                                   DoesNotHavePointerEscape, IsFromVarDecl);
 
     return SGF.B.createBeginBorrow(PrologueLoc, value, isLexical,
                                    DoesNotHavePointerEscape, IsFromVarDecl);

lib/Serialization/DeserializeSIL.cpp

@@ -2373,12 +2373,12 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
     bool AllowsDiagnostics = Attr & 0x1;
     IsLexical_t isLexical = IsLexical_t((Attr >> 1) & 0x1);
     auto isEscaping = HasPointerEscape_t((Attr >> 2) & 0x1);
-    bool IsFromVarDecl = (Attr >> 3) & 0x1;
+    auto isFromVarDecl = IsFromVarDecl_t((Attr >> 3) & 0x1);
     auto *MVI = Builder.createMoveValue(
         Loc,
         getLocalValue(Builder.maybeGetFunction(), ValID,
                       getSILType(Ty, (SILValueCategory)TyCategory, Fn)),
-        isLexical, isEscaping, IsFromVarDecl);
+        isLexical, isEscaping, isFromVarDecl);
     MVI->setAllowsDiagnostics(AllowsDiagnostics);
     ResultInst = MVI;
     break;