Merge pull request #78123 from meg-gupta/newflag

Add new flag -sil-ownership-verify-all
swiftlang · Dec 13, 2024 · 28e33af · 28e33af
2 parents 2405db0 + 8b1ecb8
commit 28e33af
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/include/swift/AST/SILOptions.h b/include/swift/AST/SILOptions.h
@@ -160,6 +160,9 @@ class SILOptions {
   /// Controls whether or not paranoid verification checks are run.
   bool VerifyAll = false;
 
+  /// Verify ownership after every pass.
+  bool VerifyOwnershipAll = false;
+
   /// If true, no SIL verification is done at all.
   bool VerifyNone = false;
 

diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -941,6 +941,9 @@ def sil_verify_all : Flag<["-"], "sil-verify-all">,
 
 def sil_verify_none : Flag<["-"], "sil-verify-none">,
   HelpText<"Completely disable SIL verification">;
+
+def sil_ownership_verify_all : Flag<["-"], "sil-ownership-verify-all">,
+  HelpText<"Verify ownership after each transform">;
 
 def verify_all_substitution_maps : Flag<["-"], "verify-all-substitution-maps">,
   HelpText<"Verify all SubstitutionMaps on construction">;

diff --git a/include/swift/SIL/SILFunction.h b/include/swift/SIL/SILFunction.h
@@ -1659,6 +1659,11 @@ class SILFunction
   /// Verifies the lifetime of memory locations in the function.
   void verifyMemoryLifetime(CalleeCache *calleeCache);
 
+  /// Verifies ownership of the function.
+  /// Since we don't have complete lifetimes everywhere, computes DeadEndBlocks
+  /// and calls verifyOwnership(DeadEndBlocks *deadEndBlocks)
+  void verifyOwnership() const;
+
   /// Run the SIL ownership verifier to check that all values with ownership
   /// have a linear lifetime. Regular OSSA invariants are checked separately in
   /// normal SIL verification.

diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -2824,6 +2824,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
 
   Opts.VerifyAll |= Args.hasArg(OPT_sil_verify_all);
   Opts.VerifyNone |= Args.hasArg(OPT_sil_verify_none);
+  Opts.VerifyOwnershipAll |= Args.hasArg(OPT_sil_ownership_verify_all);
   Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);
   Opts.EmitVerboseSIL |= Args.hasArg(OPT_emit_verbose_sil);
   Opts.EmitSortedSIL |= Args.hasArg(OPT_emit_sorted_sil);

diff --git a/lib/SIL/Verifier/SILOwnershipVerifier.cpp b/lib/SIL/Verifier/SILOwnershipVerifier.cpp
@@ -963,6 +963,12 @@ void SILModule::verifyOwnership() const {
   }
 }
 
+void SILFunction::verifyOwnership() const {
+  auto deBlocks =
+      std::make_unique<DeadEndBlocks>(const_cast<SILFunction *>(this));
+  verifyOwnership(deBlocks.get());
+}
+
 void SILFunction::verifyOwnership(DeadEndBlocks *deadEndBlocks) const {
   if (!getModule().getOptions().VerifySILOwnership)
     return;

diff --git a/lib/SILOptimizer/PassManager/PassManager.cpp b/lib/SILOptimizer/PassManager/PassManager.cpp
@@ -760,6 +760,9 @@ void SILPassManager::runPassOnFunction(unsigned TransIdx, SILFunction *F) {
     F->verify(getAnalysis<BasicCalleeAnalysis>()->getCalleeCache());
     verifyAnalyses(F);
     runSwiftFunctionVerification(F);
+  } else if (getOptions().VerifyOwnershipAll &&
+             (CurrentPassHasInvalidated || SILVerifyWithoutInvalidation)) {
+    F->verifyOwnership();
   } else {
     if ((SILVerifyAfterPass.end() != std::find_if(SILVerifyAfterPass.begin(),
                                                   SILVerifyAfterPass.end(),