Merge pull request #72148 from atrick/enable-lifetime-diagnostics

atrick · web-flow · commit 3364648f2b51 · 2024-03-07T18:54:33.000-08:00
Enable lifetime dependence diagnostics for Nonescapable types.
diff --git a/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceScopeFixup.swift b/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceScopeFixup.swift
@@ -31,6 +31,9 @@ private func log(_ message: @autoclosure () -> String) {
 let lifetimeDependenceScopeFixupPass = FunctionPass(
   name: "lifetime-dependence-scope-fixup")
 { (function: Function, context: FunctionPassContext) in
+  if !context.options.hasFeature(.NonescapableTypes) {
+    return
+  }
   log(" --- Scope fixup for lifetime dependence in \(function.name)")
 
   let localReachabilityCache = LocalVariableReachabilityCache()
diff --git a/include/swift/AST/SILOptions.h b/include/swift/AST/SILOptions.h
@@ -137,6 +137,9 @@ class SILOptions {
   /// function pointers.
   bool EnableImportPtrauthFieldFunctionPointers = false;
 
+  /// Enables SIL-level diagnostics for NonescapableTypes.
+  bool EnableLifetimeDependenceDiagnostics = true;
+
   /// Controls whether or not paranoid verification checks are run.
   bool VerifyAll = false;
 
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -1240,6 +1240,13 @@ def disable_import_ptrauth_field_function_pointers :
   Flag<["-"], "disable-import-ptrauth-field-function-pointers">,
   HelpText<"Disable import of custom ptrauth qualified field function pointers">;
 
+def enable_lifetime_dependence_diagnostics :
+  Flag<["-"], "enable-lifetime-dependence-diagnostics">,
+  HelpText<"Enable lifetime dependence diagnostics for Nonescapable types.">;
+def disable_lifetime_dependence_diagnostics :
+  Flag<["-"], "disable-lifetime-dependence-diagnostics">,
+  HelpText<"Disable lifetime dependence diagnostics for Nonescapable types.">;
+
 def enable_collocate_metadata_functions :
   Flag<["-"], "enable-collocate-metadata-functions">,
   HelpText<"Enable collocate metadata functions">;
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -2352,6 +2352,11 @@ static bool ParseSILArgs(SILOptions &Opts, ArgList &Args,
       Args.hasArg(OPT_enable_import_ptrauth_field_function_pointers,
                   OPT_disable_import_ptrauth_field_function_pointers,
                   Opts.EnableImportPtrauthFieldFunctionPointers);
+  Opts.EnableLifetimeDependenceDiagnostics =
+      Args.hasFlag(OPT_enable_lifetime_dependence_diagnostics,
+                   OPT_disable_lifetime_dependence_diagnostics,
+                   Opts.EnableLifetimeDependenceDiagnostics);
+
   Opts.VerifyAll |= Args.hasArg(OPT_sil_verify_all);
   Opts.VerifyNone |= Args.hasArg(OPT_sil_verify_none);
   Opts.DebugSerialization |= Args.hasArg(OPT_sil_debug_serialization);
diff --git a/lib/SILOptimizer/PassManager/PassPipeline.cpp b/lib/SILOptimizer/PassManager/PassPipeline.cpp
@@ -65,18 +65,6 @@ static llvm::cl::opt<bool>
     EnableDeinitDevirtualizer("enable-deinit-devirtualizer", llvm::cl::init(false),
                           llvm::cl::desc("Enable the DestroyHoisting pass."));
 
-// Temporary flag until the stdlib builds with ~Escapable
-static llvm::cl::opt<bool>
-EnableLifetimeDependenceInsertion(
-  "enable-lifetime-dependence-insertion", llvm::cl::init(false),
-  llvm::cl::desc("Enable lifetime dependence insertion."));
-
-// Temporary flag until the stdlib builds with ~Escapable
-static llvm::cl::opt<bool>
-EnableLifetimeDependenceDiagnostics(
-  "enable-lifetime-dependence-diagnostics", llvm::cl::init(false),
-  llvm::cl::desc("Enable lifetime dependence diagnostics."));
-
 //===----------------------------------------------------------------------===//
 //                          Diagnostic Pass Pipeline
 //===----------------------------------------------------------------------===//
@@ -184,7 +172,7 @@ static void addMandatoryDiagnosticOptPipeline(SILPassPipelinePlan &P) {
   P.addMoveOnlyChecker();
 
   // Check ~Escapable.
-  if (EnableLifetimeDependenceDiagnostics) {
+  if (P.getOptions().EnableLifetimeDependenceDiagnostics) {
     P.addLifetimeDependenceDiagnostics();
   }
   if (EnableDeinitDevirtualizer)
@@ -296,10 +284,8 @@ SILPassPipelinePlan::getSILGenPassPipeline(const SILOptions &Options) {
   P.startPipeline("SILGen Passes");
 
   P.addSILGenCleanup();
-  if (EnableLifetimeDependenceDiagnostics || EnableLifetimeDependenceInsertion) {
+  if (P.getOptions().EnableLifetimeDependenceDiagnostics) {
     P.addLifetimeDependenceInsertion();
-  }
-  if (EnableLifetimeDependenceDiagnostics) {
     P.addLifetimeDependenceScopeFixup();
   }
   if (SILViewSILGenCFG) {
diff --git a/test/SILOptimizer/lifetime_dependence_borrow.swift b/test/SILOptimizer/lifetime_dependence_borrow.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_borrow_fail.swift b/test/SILOptimizer/lifetime_dependence_borrow_fail.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_diagnostics.swift b/test/SILOptimizer/lifetime_dependence_diagnostics.swift
@@ -3,7 +3,6 @@
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
 // RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics \
 // RUN:   2>&1 | %FileCheck %s
 
 // REQUIRES: asserts
diff --git a/test/SILOptimizer/lifetime_dependence_generic.swift b/test/SILOptimizer/lifetime_dependence_generic.swift
@@ -5,7 +5,6 @@
 // RUN:   -disable-experimental-parser-round-trip \
 // RUN:   -enable-experimental-feature NonescapableTypes \
 // RUN:   -enable-experimental-feature NoncopyableGenerics \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics \
 // RUN:   -parse-stdlib -module-name Swift
 
 // REQUIRES: asserts
diff --git a/test/SILOptimizer/lifetime_dependence_inherit.swift b/test/SILOptimizer/lifetime_dependence_inherit.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_inherit_fail.swift b/test/SILOptimizer/lifetime_dependence_inherit_fail.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_insertion.swift b/test/SILOptimizer/lifetime_dependence_insertion.swift
@@ -1,10 +1,10 @@
 // RUN: %target-swift-frontend %s -emit-sil \
+// RUN:   -Xllvm -sil-print-after=lifetime-dependence-insertion \
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
 // RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-insertion \
-// RUN:   2>&1 | %FileCheck %s
+// RUN:   -o /dev/null 2>&1 | %FileCheck %s
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
@@ -34,13 +34,15 @@ struct NC : ~Copyable {
 @_silgen_name("use")
 func use(_ o : borrowing BV)
 
-// CHECK-LABEL: sil hidden @$s4test13bv_borrow_var1p1iySV_SitF : $@convention(thin) (UnsafeRawPointer, Int) -> () {
-// CHECK: [[A:%.*]] = begin_access [read] [static] %{{.*}} : $*NC
-// CHECK: [[L:%.*]] = load [[A]] : $*NC
+// CHECK-LABEL: sil hidden [ossa] @$s4test13bv_borrow_var1p1iySV_SitF : $@convention(thin) (UnsafeRawPointer, Int) -> () {
+// CHECK: [[A:%.*]] = begin_access [read] [unknown] %{{.*}} : $*NC
+// CHECK: [[U:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] [[A]] : $*NC 
+// CHECK: [[L:%.*]] = load [copy] [[U]] : $*NC
 // CHECK:   [[R:%.*]] = apply %{{.*}}([[L]]) : $@convention(method) (@guaranteed NC) -> _scope(0) @owned BV
 // CHECK:   [[M:%.*]] = mark_dependence [unresolved] [[R]] : $BV on [[A]] : $*NC
 // CHECK:   end_access [[A]] : $*NC
-// CHECK:   %{{.*}} = apply %{{.*}}([[M]]) : $@convention(thin) (@guaranteed BV) -> ()
+// CHECK:   [[MV:%.*]] = move_value [var_decl] [[M]] : $BV
+// CHECK:   %{{.*}} = apply %{{.*}}([[MV]]) : $@convention(thin) (@guaranteed BV) -> ()
 // CHECK-LABEL: } // end sil function '$s4test13bv_borrow_var1p1iySV_SitF'
 func bv_borrow_var(p: UnsafeRawPointer, i: Int) {
   var nc = NC(p: p, i: i)
diff --git a/test/SILOptimizer/lifetime_dependence_mutate.swift b/test/SILOptimizer/lifetime_dependence_mutate.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_param.swift b/test/SILOptimizer/lifetime_dependence_param.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_param_fail.swift b/test/SILOptimizer/lifetime_dependence_param_fail.swift
@@ -4,8 +4,7 @@
 // RUN:   -sil-verify-all \
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/SILOptimizer/lifetime_dependence_scope.swift b/test/SILOptimizer/lifetime_dependence_scope.swift
@@ -3,7 +3,6 @@
 // RUN:   -module-name test \
 // RUN:   -disable-experimental-parser-round-trip \
 // RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics \
 // RUN:   2>&1 | %FileCheck %s
 
 // REQUIRES: asserts
diff --git a/test/SILOptimizer/lifetime_dependence_scope_fixup.swift b/test/SILOptimizer/lifetime_dependence_scope_fixup.swift
@@ -1,8 +1,7 @@
 // RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify \
 // RUN: -enable-experimental-feature NonescapableTypes \
 // RUN: -disable-experimental-parser-round-trip \
-// RUN: -enable-experimental-feature NoncopyableGenerics \
-// RUN:  -Xllvm -enable-lifetime-dependence-diagnostics=true
+// RUN: -enable-experimental-feature NoncopyableGenerics
 
 // REQUIRES: asserts
 
diff --git a/test/SILOptimizer/lifetime_dependence_todo.swift b/test/SILOptimizer/lifetime_dependence_todo.swift
@@ -2,8 +2,7 @@
 // RUN:   -o /dev/null \
 // RUN:   -verify \
 // RUN:   -sil-verify-all \
-// RUN:   -enable-experimental-feature NonescapableTypes \
-// RUN:   -Xllvm -enable-lifetime-dependence-diagnostics
+// RUN:   -enable-experimental-feature NonescapableTypes
 
 // REQUIRES: asserts
 // REQUIRES: swift_in_compiler
diff --git a/test/Serialization/explicit_lifetime_dependence.swift b/test/Serialization/explicit_lifetime_dependence.swift
@@ -2,7 +2,8 @@
 // RUN: %target-swift-frontend -emit-module -o %t  %S/Inputs/def_explicit_lifetime_dependence.swift \
 // RUN: -enable-experimental-feature NonescapableTypes \
 // RUN: -disable-experimental-parser-round-trip \
-// RUN: -enable-experimental-feature NoncopyableGenerics
+// RUN: -enable-experimental-feature NoncopyableGenerics \
+// RUN: -disable-lifetime-dependence-diagnostics
 
 // RUN: llvm-bcanalyzer %t/def_explicit_lifetime_dependence.swiftmodule 
 
diff --git a/test/Serialization/implicit_lifetime_dependence.swift b/test/Serialization/implicit_lifetime_dependence.swift
@@ -2,7 +2,8 @@
 // RUN: %target-swift-frontend -emit-module -o %t  %S/Inputs/def_implicit_lifetime_dependence.swift \
 // RUN: -enable-experimental-feature NonescapableTypes \
 // RUN: -disable-experimental-parser-round-trip \
-// RUN: -enable-experimental-feature NoncopyableGenerics
+// RUN: -enable-experimental-feature NoncopyableGenerics \
+// RUN: -disable-lifetime-dependence-diagnostics
 
 // RUN: llvm-bcanalyzer %t/def_implicit_lifetime_dependence.swiftmodule 
 
