Merge pull request swiftlang#23382 from gottesmm/pr-70738274d737cc40c6973417c97dfc24b81133c7

[ownership] Rename enable-sil-ownership => verify-sil-ownership.

Author: gottesmm

CMakeLists.txt

@@ -327,10 +327,6 @@ option(SWIFT_STDLIB_USE_NONATOMIC_RC
     "Build the standard libraries and overlays with nonatomic reference count operations enabled"
     FALSE)
 
-option(SWIFT_STDLIB_ENABLE_SIL_OWNERSHIP
-  "Build the standard libraries and overlays with sil ownership enabled."
-  FALSE)
-
 option(SWIFT_ENABLE_RUNTIME_FUNCTION_COUNTERS
   "Enable runtime function counters and expose the API."
   FALSE)

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -314,7 +314,7 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options
       "-c"
-      "-Xfrontend" "-enable-sil-ownership"
+      "-Xfrontend" "-verify-sil-ownership"
       "-target" "${target}"
       "-${BENCH_COMPILE_ARCHOPTS_OPT}" ${PAGE_ALIGNMENT_OPTION})
 
@@ -344,7 +344,7 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options_driver
       "-c"
-      "-Xfrontend" "-enable-sil-ownership"
+      "-Xfrontend" "-verify-sil-ownership"
       "-target" "${target}"
       "-${driver_opt}")
 

cmake/modules/SwiftSource.cmake

@@ -236,7 +236,7 @@ function(_compile_swift_files
   endif()
 
   if(SWIFTFILE_IS_STDLIB)
-    list(APPEND swift_flags "-Xfrontend" "-enable-sil-ownership")
+    list(APPEND swift_flags "-Xfrontend" "-verify-sil-ownership")
     list(APPEND swift_flags "-Xfrontend" "-enable-mandatory-semantic-arc-opts")
   endif()
 

include/swift/AST/SILOptions.h

@@ -112,7 +112,7 @@ class SILOptions {
   std::string SILOutputFileNameForDebugging;
 
   /// If set to true, compile with the SIL Ownership Model enabled.
-  bool EnableSILOwnership = false;
+  bool VerifySILOwnership = false;
 
   /// Assume that code will be executed in a single-threaded environment.
   bool AssumeSingleThreaded = false;

include/swift/Option/FrontendOptions.td

@@ -299,8 +299,8 @@ def emit_pch : Flag<["-"], "emit-pch">,
 def pch_disable_validation : Flag<["-"], "pch-disable-validation">,
   HelpText<"Disable validating the persistent PCH">;
 
-def enable_sil_ownership : Flag<["-"], "enable-sil-ownership">,
-  HelpText<"Enable the SIL Ownership Model">;
+def verify_sil_ownership : Flag<["-"], "verify-sil-ownership">,
+  HelpText<"Verify ownership invariants during SIL Verification ">;
 
 def enable_mandatory_semantic_arc_opts : Flag<["-"], "enable-mandatory-semantic-arc-opts">,
   HelpText<"Enable the mandatory semantic arc optimizer">;

lib/Frontend/CompilerInvocation.cpp

@@ -767,7 +767,7 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
   Opts.EmitProfileCoverageMapping |= Args.hasArg(OPT_profile_coverage_mapping);
   Opts.DisableSILPartialApply |=
     Args.hasArg(OPT_disable_sil_partial_apply);
-  Opts.EnableSILOwnership |= Args.hasArg(OPT_enable_sil_ownership);
+  Opts.VerifySILOwnership |= Args.hasArg(OPT_verify_sil_ownership);
   Opts.EnableMandatorySemanticARCOpts |=
       Args.hasArg(OPT_enable_mandatory_semantic_arc_opts);
   Opts.EnableLargeLoadableTypes |= Args.hasArg(OPT_enable_large_loadable_types);

lib/SIL/SILOwnershipVerifier.cpp

@@ -630,7 +630,7 @@ void SILInstruction::verifyOperandOwnership() const {
     return;
 
   // If SILOwnership is not enabled, do not perform verification.
-  if (!getModule().getOptions().EnableSILOwnership)
+  if (!getModule().getOptions().VerifySILOwnership)
     return;
 
   // If the given function has unqualified ownership or we have been asked by

lib/SIL/SILVerifier.cpp

@@ -429,7 +429,7 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
   void operator=(const SILVerifier&) = delete;
 public:
   bool isSILOwnershipEnabled() const {
-    return F.getModule().getOptions().EnableSILOwnership;
+    return F.getModule().getOptions().VerifySILOwnership;
   }
 
   void _require(bool condition, const Twine &complaint,

lib/SIL/ValueOwnership.cpp

@@ -223,7 +223,7 @@ ValueOwnershipKindClassifier::visitForwardingInst(SILInstruction *i,
     // If we have mismatched SILOwnership and sil ownership is not enabled,
     // just return Any for staging purposes. If SILOwnership is enabled, then
     // we must assert!
-    if (!i->getModule().getOptions().EnableSILOwnership) {
+    if (!i->getModule().getOptions().VerifySILOwnership) {
       return ValueOwnershipKind::Any;
     }
     llvm_unreachable("Forwarding inst with mismatching ownership kinds?!");

lib/SILOptimizer/Mandatory/SemanticARCOpts.cpp

@@ -378,7 +378,7 @@ struct SemanticARCOpts : SILFunctionTransform {
     SILFunction &f = *getFunction();
 
     // Make sure we are running with ownership verification enabled.
-    assert(f.getModule().getOptions().EnableSILOwnership &&
+    assert(f.getModule().getOptions().VerifySILOwnership &&
            "Can not perform semantic arc optimization unless ownership "
            "verification is enabled");