[Frontend] NFC: Rename PreconcurrencyConformances to DynamicActorIsolation

xedin · xedin · commit db7959668e71 · 2024-02-01T13:28:25.000-08:00
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -5642,7 +5642,7 @@ ERROR(preconcurrency_not_inheritance_clause,none,
 ERROR(preconcurrency_not_existential,none,
       "'preconcurrency' attribute cannot apply to non-protocol type %0", (Type))
 ERROR(preconcurrency_attr_disabled,none,
-      "attribute requires '-enable-experimental-feature PreconcurrencyConformances'", ())
+      "attribute requires '-enable-experimental-feature DynamicActorIsolation'", ())
 
 ERROR(redundant_any_in_existential,none,
        "redundant 'any' in type %0",
diff --git a/include/swift/Basic/Features.def b/include/swift/Basic/Features.def
@@ -271,8 +271,10 @@ EXPERIMENTAL_FEATURE(GroupActorErrors, true)
 // Allow for the 'transferring' keyword to be applied to arguments and results.
 EXPERIMENTAL_FEATURE(TransferringArgsAndResults, true)
 
-// Enable `@preconcurrency` attribute on protocol conformances.
-EXPERIMENTAL_FEATURE(PreconcurrencyConformances, false)
+// Enable `@preconcurrency` attribute on protocol conformances and runtime checks
+// of actor isolation in @obj thunks and arguments of APIs that haven't yet adopted
+// strict concurrency checking.
+EXPERIMENTAL_FEATURE(DynamicActorIsolation, false)
 
 // Allow for `switch` of noncopyable values to be borrowing or consuming.
 EXPERIMENTAL_FEATURE(BorrowingSwitch, true)
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -3876,7 +3876,7 @@ static bool usesFeatureTransferringArgsAndResults(Decl *decl) {
   return false;
 }
 
-static bool usesFeaturePreconcurrencyConformances(Decl *decl) {
+static bool usesFeatureDynamicActorIsolation(Decl *decl) {
   auto usesPreconcurrencyConformance = [&](const InheritedTypes &inherited) {
     return llvm::any_of(
         inherited.getEntries(),
diff --git a/lib/SILGen/SILGenBridging.cpp b/lib/SILGen/SILGenBridging.cpp
@@ -1594,7 +1594,7 @@ void SILGenFunction::emitNativeToForeignThunk(SILDeclRef thunk) {
   Scope scope(Cleanups, CleanupLocation(loc));
 
   bool emitExecutorPrecondition =
-      getASTContext().LangOpts.hasFeature(Feature::PreconcurrencyConformances);
+      getASTContext().LangOpts.hasFeature(Feature::DynamicActorIsolation);
 
   llvm::Optional<ActorIsolation> isolation;
   if (F.isAsync()) {
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -7416,7 +7416,7 @@ Expr *ExprRewriter::coerceToType(Expr *expr, Type toType,
       }
     }
 
-    if (ctx.LangOpts.hasFeature(Feature::PreconcurrencyConformances)) {
+    if (ctx.LangOpts.hasFeature(Feature::DynamicActorIsolation)) {
       // Passing a synchronous global actor-isolated function value and
       // parameter that expects a synchronous non-isolated function type could
       // require a runtime check to ensure that function is always called in
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -3347,7 +3347,7 @@ TypeResolver::resolveAttributedType(TypeRepr *repr, TypeResolutionOptions option
 
   if (auto preconcurrencyAttr = claim<PreconcurrencyTypeAttr>(attrs)) {
     auto &ctx = getASTContext();
-    if (ctx.LangOpts.hasFeature(Feature::PreconcurrencyConformances)) {
+    if (ctx.LangOpts.hasFeature(Feature::DynamicActorIsolation)) {
       if (ty->hasError())
         return ty;
 
diff --git a/test/ClangImporter/preconcurrency_conformances.swift b/test/ClangImporter/preconcurrency_conformances.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -enable-experimental-feature PreconcurrencyConformances -emit-silgen %s | %FileCheck %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -emit-silgen %s | %FileCheck %s
 
 // REQUIRES: asserts
 // REQUIRES: concurrency
diff --git a/test/Concurrency/dynamic_checks_for_func_refs_in_preconcurrency_apis.swift b/test/Concurrency/dynamic_checks_for_func_refs_in_preconcurrency_apis.swift
@@ -12,7 +12,7 @@
 // RUN:   -I %t \
 // RUN:   -disable-availability-checking \
 // RUN:   -module-name Client \
-// RUN:   -enable-experimental-feature PreconcurrencyConformances \
+// RUN:   -enable-experimental-feature DynamicActorIsolation \
 // RUN:    %t/src/Client.swift -verify | %FileCheck %s
 
 // Delete swiftmodule to test building against swiftinterface
@@ -23,7 +23,7 @@
 // RUN:   -I %t \
 // RUN:   -disable-availability-checking \
 // RUN:   -module-name Client \
-// RUN:   -enable-experimental-feature PreconcurrencyConformances \
+// RUN:   -enable-experimental-feature DynamicActorIsolation \
 // RUN:    %t/src/Client.swift -verify | %FileCheck %s
 
 // REQUIRES: asserts
diff --git a/test/Concurrency/dynamic_checks_for_func_refs_in_preconcurrency_apis_objc.swift b/test/Concurrency/dynamic_checks_for_func_refs_in_preconcurrency_apis_objc.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature PreconcurrencyConformances -emit-silgen -verify %s | %FileCheck %s
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-experimental-feature DynamicActorIsolation -emit-silgen -verify %s | %FileCheck %s
 // REQUIRES: objc_interop
 
 import Foundation
diff --git a/test/Concurrency/preconcurrency_conformances.swift b/test/Concurrency/preconcurrency_conformances.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -swift-version 5 -disable-availability-checking %s -emit-sil -o /dev/null -verify -enable-experimental-feature PreconcurrencyConformances -strict-concurrency=complete -verify-additional-prefix complete-tns-
+// RUN: %target-swift-frontend -swift-version 5 -disable-availability-checking %s -emit-sil -o /dev/null -verify -enable-experimental-feature DynamicActorIsolation -strict-concurrency=complete -verify-additional-prefix complete-tns-
 
 // REQUIRES: concurrency
 // REQUIRES: asserts
diff --git a/test/Interpreter/preconcurrency_conformances.swift b/test/Interpreter/preconcurrency_conformances.swift
@@ -12,21 +12,21 @@
 // RUN:    -target %target-cpu-apple-macosx10.15 \
 // RUN:    -I %t -L %t -l Interface \
 // RUN:    -emit-module-interface-path %t/Types.swiftinterface \
-// RUN:    -Xfrontend -enable-experimental-feature -Xfrontend PreconcurrencyConformances
+// RUN:    -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation
 
-// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend PreconcurrencyConformances -I %t -L %t -l Types %t/src/Crash1.swift -o %t/crash1.out
+// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash1.swift -o %t/crash1.out
 // RUN: %target-codesign %t/crash1.out
 // RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash1.out 2>&1 | %FileCheck %t/src/Crash1.swift
 
-// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend PreconcurrencyConformances -I %t -L %t -l Types %t/src/Crash2.swift -o %t/crash2.out
+// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash2.swift -o %t/crash2.out
 // RUN: %target-codesign %t/crash2.out
 // RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash2.out 2>&1 | %FileCheck %t/src/Crash2.swift
 
-// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend PreconcurrencyConformances -I %t -L %t -l Types %t/src/Crash3.swift -o %t/crash3.out
+// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash3.swift -o %t/crash3.out
 // RUN: %target-codesign %t/crash3.out
 // RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash3.out 2>&1 | %FileCheck %t/src/Crash3.swift
 
-// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend PreconcurrencyConformances -I %t -L %t -l Types %t/src/Crash4.swift -o %t/crash4.out
+// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash4.swift -o %t/crash4.out
 // RUN: %target-codesign %t/crash4.out
 // RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash4.out 2>&1 | %FileCheck %t/src/Crash4.swift
 
diff --git a/test/ModuleInterface/preconcurrency_conformances.swift b/test/ModuleInterface/preconcurrency_conformances.swift
@@ -12,17 +12,17 @@
 // RUN:   -module-name Client -I %t -swift-version 5 -enable-library-evolution \
 // RUN:   -emit-module-path %t/Client.swiftmodule \
 // RUN:   -emit-module-interface-path %t/Client.swiftinterface \
-// RUN:   -enable-experimental-feature PreconcurrencyConformances \
+// RUN:   -enable-experimental-feature DynamicActorIsolation \
 // RUN:   -disable-availability-checking \
 // RUN:   -verify
 
 // RUN: %FileCheck %s < %t/Client.swiftinterface
 
 // RUN: %target-swift-emit-module-interface(%t/Client.swiftinterface) -I %t %t/src/Client.swift -module-name Client \
-// RUN:   -disable-availability-checking -enable-experimental-feature PreconcurrencyConformances -verify
+// RUN:   -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -verify
 
 // RUN: %target-swift-typecheck-module-from-interface(%t/Client.swiftinterface) -I %t -module-name Client \
-// RUN:   -disable-availability-checking -enable-experimental-feature PreconcurrencyConformances -verify
+// RUN:   -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -verify
 
 // REQUIRES: asserts
 // REQUIRES: concurrency
@@ -44,7 +44,7 @@ public protocol WithAssoc {
 //--- Client.swift
 import A
 
-// CHECK: #if {{.*}} $PreconcurrencyConformances
+// CHECK: #if {{.*}} $DynamicActorIsolation
 // CHECK-NEXT: @_Concurrency.MainActor public struct GlobalActorTest : @preconcurrency A.P
 
 @MainActor
@@ -56,13 +56,13 @@ public struct GlobalActorTest : @preconcurrency P {
 public class ExtTest {
 }
 
-// CHECK: #if {{.*}} $PreconcurrencyConformances
+// CHECK: #if {{.*}} $DynamicActorIsolation
 // CHECK-NEXT: extension Client.ExtTest : @preconcurrency A.P
 extension ExtTest : @preconcurrency P {
   public func test() -> Int { 1 }
 }
 
-// CHECK: #if {{.*}} && $PreconcurrencyConformances
+// CHECK: #if {{.*}} && $DynamicActorIsolation
 // CHECK-NEXT: public actor ActorTest : @preconcurrency A.P
 public actor ActorTest : @preconcurrency P {
   public func test() -> Int { 2 }
@@ -71,22 +71,22 @@ public actor ActorTest : @preconcurrency P {
 public actor ActorExtTest {
 }
 
-// CHECK: #if {{.*}} $PreconcurrencyConformances
+// CHECK: #if {{.*}} $DynamicActorIsolation
 // CHECK-NEXT: extension Client.ActorExtTest : @preconcurrency A.Q
 extension ActorExtTest : @preconcurrency Q {
   public var x: Int { 42 }
 }
 
 public struct TestConditional<T> {}
 
-// CHECK: #if {{.*}} $PreconcurrencyConformances
+// CHECK: #if {{.*}} $DynamicActorIsolation
 // CHECK-NEXT: extension Client.TestConditional : @preconcurrency A.WithAssoc where T == Swift.Int {
 // CHECK-NEXT:  @_Concurrency.MainActor public func test() -> T
 // CHECK-NEXT: }
 extension TestConditional : @preconcurrency WithAssoc where T == Int {
   @MainActor public func test() -> T { 42 } // Ok
 }
 
-// CHECK: #if {{.*}} $PreconcurrencyConformances
+// CHECK: #if {{.*}} $DynamicActorIsolation
 // CHECK-NEXT: extension Client.GlobalActorTest : Swift.Sendable {}
 // CHECK-NEXT: #endif
diff --git a/test/SILGen/preconcurrency_conformances.swift b/test/SILGen/preconcurrency_conformances.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-silgen -disable-availability-checking -module-name preconcurrency_conformances -enable-experimental-feature PreconcurrencyConformances %s -verify | %FileCheck %s
+// RUN: %target-swift-emit-silgen -disable-availability-checking -module-name preconcurrency_conformances -enable-experimental-feature DynamicActorIsolation %s -verify | %FileCheck %s
 
 // REQUIRES: asserts
 // REQUIRES: concurrency

Original file line number	Diff line number	Diff line change
`@@ -3876,7 +3876,7 @@ static bool usesFeatureTransferringArgsAndResults(Decl *decl) {`
`3876`	`3876`	`return false;`
`3877`	`3877`	`}`
`3878`	`3878`
`3879`		`-static bool usesFeaturePreconcurrencyConformances(Decl *decl) {`
	`3879`	`+static bool usesFeatureDynamicActorIsolation(Decl *decl) {`
`3880`	`3880`	`auto usesPreconcurrencyConformance = [&](const InheritedTypes &inherited) {`
`3881`	`3881`	`return llvm::any_of(`
`3882`	`3882`	`inherited.getEntries(),`
Original file line number	Diff line number	Diff line change
`@@ -7416,7 +7416,7 @@ Expr ExprRewriter::coerceToType(Expr expr, Type toType,`
`7416`	`7416`	`}`
`7417`	`7417`	`}`
`7418`	`7418`
`7419`		`- if (ctx.LangOpts.hasFeature(Feature::PreconcurrencyConformances)) {`
	`7419`	`+ if (ctx.LangOpts.hasFeature(Feature::DynamicActorIsolation)) {`
`7420`	`7420`	`// Passing a synchronous global actor-isolated function value and`
`7421`	`7421`	`// parameter that expects a synchronous non-isolated function type could`
`7422`	`7422`	`// require a runtime check to ensure that function is always called in`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -enable-experimental-feature PreconcurrencyConformances -emit-silgen %s \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -emit-silgen %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`	`// REQUIRES: concurrency`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -swift-version 5 -disable-availability-checking %s -emit-sil -o /dev/null -verify -enable-experimental-feature PreconcurrencyConformances -strict-concurrency=complete -verify-additional-prefix complete-tns-`
	`1`	`+// RUN: %target-swift-frontend -swift-version 5 -disable-availability-checking %s -emit-sil -o /dev/null -verify -enable-experimental-feature DynamicActorIsolation -strict-concurrency=complete -verify-additional-prefix complete-tns-`
`2`	`2`
`3`	`3`	`// REQUIRES: concurrency`
`4`	`4`	`// REQUIRES: asserts`