Merge pull request #73195 from nate-chandler/lifetime-completion/20240422/1

[SIL] Verify complete lifetimes when option set.

Author: nate-chandler

lib/SILOptimizer/Transforms/CopyPropagation.cpp

@@ -635,7 +635,9 @@ void CopyPropagation::run() {
     accessBlockAnalysis->unlockInvalidation();
     if (f->getModule().getOptions().VerifySILOwnership) {
       auto *deBlocksAnalysis = getAnalysis<DeadEndBlocksAnalysis>();
-      f->verifyOwnership(deBlocksAnalysis->get(f));
+      f->verifyOwnership(f->getModule().getOptions().OSSAVerifyComplete
+                             ? nullptr
+                             : deBlocksAnalysis->get(f));
     }
   }
 }

lib/SILOptimizer/UtilityPasses/OwnershipVerifierTextualErrorDumper.cpp

@@ -23,6 +23,7 @@
 #include "swift/SIL/BasicBlockUtils.h"
 #include "swift/SIL/SILFunction.h"
 #include "swift/SIL/SILInstruction.h"
+#include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
 
@@ -37,8 +38,10 @@ namespace {
 class OwnershipVerifierTextualErrorDumper : public SILFunctionTransform {
   void run() override {
     SILFunction *f = getFunction();
-    DeadEndBlocks deadEndBlocks(f);
-    f->verifyOwnership(&deadEndBlocks);
+    auto *deBlocksAnalysis = getAnalysis<DeadEndBlocksAnalysis>();
+    f->verifyOwnership(f->getModule().getOptions().OSSAVerifyComplete
+                           ? nullptr
+                           : deBlocksAnalysis->get(f));
   }
 };