[OSSACompleteLifetime] Flag disables leak checking

The utility effectively determines whether a value leaks as part of its
work, a subset of the checking done by the ownership verifier.  Disable
that checking when the flag that disables the ownership verifier is
passed.

Author: nate-chandler

lib/SIL/Utils/OSSALifetimeCompletion.cpp

@@ -333,7 +333,11 @@ void AvailabilityBoundaryVisitor::computeRegion(
       // Thus finding a value available at the end of such a block means that
       // the block does _not_ must not exits the function normally; in other
       // words its terminator must be an UnreachableInst.
-      if (!isa<UnreachableInst>(block->getTerminator())) {
+      if (!isa<UnreachableInst>(block->getTerminator()) &&
+          block->getFunction()
+              ->getModule()
+              .getASTContext()
+              .SILOpts.VerifySILOwnership) {
         llvm::errs() << "Invalid SIL provided to OSSALifetimeCompletion?! {{\n";
         llvm::errs() << "OSSALifetimeCompletion is visiting the availability "
                         "boundary of ";
@@ -358,6 +362,8 @@ void AvailabilityBoundaryVisitor::computeRegion(
             << "-sil-ownership-verify-all -Xllvm '-sil-print-function="
             << block->getFunction()->getName()
             << "' -Xllvm -sil-print-types -Xllvm -sil-print-module-on-error\n";
+        llvm::errs() << "Use the -disable-sil-ownership-verifier to disable "
+                        "this check.\n";
         llvm::report_fatal_error("Invalid lifetime of value whose availability "
                                  "boundary is being visited.");
       }
@@ -430,7 +436,11 @@ void AvailabilityBoundaryVisitor::visitAvailabilityBoundary(
       continue;
     }
     assert(hasUnavailableSuccessor() ||
-           isa<UnreachableInst>(block->getTerminator()));
+           isa<UnreachableInst>(block->getTerminator()) ||
+           !block->getFunction()
+                ->getModule()
+                .getASTContext()
+                .SILOpts.VerifySILOwnership);
     visit(block->getTerminator(),
           OSSALifetimeCompletion::LifetimeEnd::Boundary);
   }

validation-test/SILOptimizer/ossa_lifetime_completion_crash.sil

@@ -24,6 +24,7 @@ class C {}
 // CHECK: Something that ran before OSSALifetimeCompletion (the current pass, an earlier pass, SILGen) has introduced a leak of this value.
 // CHECK: Please rerun the crashing swift-frontend command with the following flags added and file a bug with the output:
 // CHECK: -sil-ownership-verify-all -Xllvm '-sil-print-function=leak_c' -Xllvm -sil-print-types -Xllvm -sil-print-module-on-error
+// CHECK: Use the -disable-sil-ownership-verifier to disable this check.
 // CHECK: Invalid lifetime of value whose availability boundary is being visited.
 sil [ossa] @leak_c : $@convention(thin) (@owned C) -> () {
 entry(%c : @owned $C):

validation-test/SILOptimizer/ossa_lifetime_completion_no_crash.sil

@@ -0,0 +1,16 @@
+// RUN: %target-sil-opt -sil-print-types    \
+// RUN:     -test-runner                    \
+// RUN:     %s                              \
+// RUN:     -sil-disable-input-verify       \
+// RUN:     -disable-sil-ownership-verifier \
+// RUN:     -o /dev/null                    \
+// RUN: 2>&1 | %FileCheck %s
+
+class C {}
+
+// CHECK: end running test
+sil [ossa] @leak_c : $@convention(thin) (@owned C) -> () {
+entry(%c : @owned $C):
+  specify_test "ossa_lifetime_completion @argument availability"
+  return undef : $()
+}