NFC: [OSSACompleteLifetime] Allow forced verifying

Author: nate-chandler

include/swift/SIL/OSSALifetimeCompletion.h

@@ -57,12 +57,20 @@ class OSSALifetimeCompletion {
   /// Extend trivial variables for lifetime diagnostics (only in SILGenCleanup).
   HandleTrivialVariable_t handleTrivialVariable;
 
+  /// Whether verification of the computed liveness should be run even when the
+  /// global setting is off.
+  /// TODO: Remove this option.
+  bool ForceLivenessVerification;
+
 public:
-  OSSALifetimeCompletion(SILFunction *function, const DominanceInfo *domInfo,
-                         DeadEndBlocks &deadEndBlocks,
-                         HandleTrivialVariable_t handleTrivialVariable = IgnoreTrivialVariable)
+  OSSALifetimeCompletion(
+      SILFunction *function, const DominanceInfo *domInfo,
+      DeadEndBlocks &deadEndBlocks,
+      HandleTrivialVariable_t handleTrivialVariable = IgnoreTrivialVariable,
+      bool forceLivenessVerification = false)
       : domInfo(domInfo), deadEndBlocks(deadEndBlocks),
-        completedValues(function), handleTrivialVariable(handleTrivialVariable) {}
+        completedValues(function), handleTrivialVariable(handleTrivialVariable),
+        ForceLivenessVerification(forceLivenessVerification) {}
 
   /// The kind of boundary at which to complete the lifetime.
   ///

lib/SIL/Utils/OSSALifetimeCompletion.cpp

@@ -501,8 +501,9 @@ bool OSSALifetimeCompletion::analyzeAndUpdateLifetime(
   };
   Walker walker(*this, scopedAddress, boundary, liveness);
   AddressUseKind result = walker.walk(scopedAddress.value);
-  if (VerifyLifetimeCompletion && boundary != Boundary::Availability
-      && result != AddressUseKind::NonEscaping) {
+  if ((VerifyLifetimeCompletion || ForceLivenessVerification) &&
+      boundary != Boundary::Availability &&
+      result != AddressUseKind::NonEscaping) {
     llvm::errs() << "Incomplete liveness for:\n" << scopedAddress.value;
     if (auto *escapingUse = walker.getEscapingUse()) {
       llvm::errs() << "  escapes at:\n";