[NFC] SIL: Typed destroy_value.poisonRefs.

Type the existing flag before adding another flag.

Author: nate-chandler

include/swift/SIL/SILBuilder.h

@@ -1442,8 +1442,9 @@ class SILBuilder {
                       ExplicitCopyValueInst(getSILDebugLocation(Loc), operand));
   }
 
-  DestroyValueInst *createDestroyValue(SILLocation Loc, SILValue operand,
-                                       bool poisonRefs = false) {
+  DestroyValueInst *
+  createDestroyValue(SILLocation Loc, SILValue operand,
+                     PoisonRefs_t poisonRefs = DontPoisonRefs) {
     assert(getFunction().hasOwnership());
     assert(isLoadableOrOpaque(operand->getType()));
     assert(!operand->getType().isTrivial(getFunction()) &&

include/swift/SIL/SILInstruction.h

@@ -5381,6 +5381,11 @@ class DebugStepInst final
   MutableArrayRef<Operand> getAllOperands() { return {}; }
 };
 
+enum PoisonRefs_t : bool {
+  DontPoisonRefs = false,
+  PoisonRefs = true,
+};
+
 /// Define the start or update to a symbolic variable value (for loadable
 /// types).
 class DebugValueInst final
@@ -8805,7 +8810,8 @@ class DestroyValueInst
   friend class SILBuilder;
   USE_SHARED_UINT8;
 
-  DestroyValueInst(SILDebugLocation DebugLoc, SILValue operand, bool poisonRefs)
+  DestroyValueInst(SILDebugLocation DebugLoc, SILValue operand,
+                   PoisonRefs_t poisonRefs)
       : UnaryInstructionBase(DebugLoc, operand) {
     setPoisonRefs(poisonRefs);
   }
@@ -8824,12 +8830,14 @@ class DestroyValueInst
   /// transformations keep the poison operation associated with the destroy
   /// point. After OSSA, these are lowered to 'debug_values [poison]'
   /// instructions, after which the Onone pipeline should avoid code motion.
-  bool poisonRefs() const { return sharedUInt8().DestroyValueInst.poisonRefs; }
+  PoisonRefs_t poisonRefs() const {
+    return PoisonRefs_t(sharedUInt8().DestroyValueInst.poisonRefs);
+  }
 
-  void setPoisonRefs(bool poisonRefs = true) {
+  void setPoisonRefs(PoisonRefs_t poisonRefs = PoisonRefs) {
     sharedUInt8().DestroyValueInst.poisonRefs = poisonRefs;
   }
-  
+
   /// If the value being destroyed is a stack allocation of a nonescaping
   /// closure, then return the PartialApplyInst that allocated the closure.
   PartialApplyInst *getNonescapingClosureAllocation() const;

lib/SIL/Parser/ParseSIL.cpp

@@ -3356,7 +3356,7 @@ bool SILParser::parseSpecificSILInstruction(SILBuilder &B,
     if (parseSILOptional(poisonRefs, *this, "poison")
         || parseTypedValueRef(Val, B) || parseSILDebugLocation(InstLoc, B))
       return true;
-    ResultVal = B.createDestroyValue(InstLoc, Val, poisonRefs);
+    ResultVal = B.createDestroyValue(InstLoc, Val, PoisonRefs_t(poisonRefs));
     break;
   }
   case SILInstructionKind::BeginCOWMutationInst: {

lib/Serialization/DeserializeSIL.cpp

@@ -2322,13 +2322,13 @@ bool SILDeserializer::readSILInstruction(SILFunction *Fn,
   }
   case SILInstructionKind::DestroyValueInst: {
     assert(RecordKind == SIL_ONE_OPERAND && "Layout should be OneOperand.");
-    unsigned poisonRefs = Attr;
+    PoisonRefs_t poisonRefs = PoisonRefs_t(Attr & 0x1);
     ResultInst = Builder.createDestroyValue(
         Loc,
         getLocalValue(
             Builder.maybeGetFunction(), ValID,
             getSILType(MF->getType(TyID), (SILValueCategory)TyCategory, Fn)),
-        poisonRefs != 0);
+        poisonRefs);
     break;
   }