Skip to content

Commit 03e9d42

Browse files
committed
[Frontend] NFC: Promote DynamicActorIsolation to an upcoming feature flag
1 parent 5609657 commit 03e9d42

9 files changed

+16
-20
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ UPCOMING_FEATURE(GlobalConcurrency, 412, 6)
191191
UPCOMING_FEATURE(InferSendableFromCaptures, 418, 6)
192192
UPCOMING_FEATURE(ImplicitOpenExistentials, 352, 6)
193193
UPCOMING_FEATURE(RegionBasedIsolation, 414, 6)
194+
UPCOMING_FEATURE(DynamicActorIsolation, 423, 6)
194195
UPCOMING_FEATURE(MoveOnlyPartialConsumption, 429, 6)
195196

196197
// Swift 7
@@ -354,11 +355,6 @@ EXPERIMENTAL_FEATURE(GroupActorErrors, true)
354355
// Allow for the 'transferring' keyword to be applied to arguments and results.
355356
EXPERIMENTAL_FEATURE(TransferringArgsAndResults, true)
356357

357-
// Enable `@preconcurrency` attribute on protocol conformances and runtime checks
358-
// of actor isolation in @obj thunks and arguments of APIs that haven't yet adopted
359-
// strict concurrency checking.
360-
EXPERIMENTAL_FEATURE(DynamicActorIsolation, false)
361-
362358
// Allow for `switch` of noncopyable values to be borrowing or consuming.
363359
EXPERIMENTAL_FEATURE(BorrowingSwitch, true)
364360

test/ClangImporter/preconcurrency_conformances.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -emit-silgen %s | %FileCheck %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -enable-upcoming-feature DynamicActorIsolation -emit-silgen %s | %FileCheck %s
22

33
// REQUIRES: asserts
44
// REQUIRES: concurrency

test/Concurrency/dynamic_checks_for_func_refs_in_preconcurrency_apis.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// RUN: -I %t \
1313
// RUN: -disable-availability-checking \
1414
// RUN: -module-name Client \
15-
// RUN: -enable-experimental-feature DynamicActorIsolation \
15+
// RUN: -enable-upcoming-feature DynamicActorIsolation \
1616
// RUN: %t/src/Client.swift -verify | %FileCheck %s
1717

1818
// Delete swiftmodule to test building against swiftinterface
@@ -23,7 +23,7 @@
2323
// RUN: -I %t \
2424
// RUN: -disable-availability-checking \
2525
// RUN: -module-name Client \
26-
// RUN: -enable-experimental-feature DynamicActorIsolation \
26+
// RUN: -enable-upcoming-feature DynamicActorIsolation \
2727
// RUN: %t/src/Client.swift -verify | %FileCheck %s
2828

2929
// REQUIRES: asserts

test/Concurrency/dynamic_checks_for_func_refs_in_preconcurrency_apis_objc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -target arm64-apple-macosx10.15 -enable-experimental-feature DynamicActorIsolation -emit-silgen -verify %s | %FileCheck %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -target arm64-apple-macosx10.15 -enable-upcoming-feature DynamicActorIsolation -emit-silgen -verify %s | %FileCheck %s
22
// REQUIRES: objc_interop
33
// REQUIRES: asserts
44

test/Concurrency/preconcurrency_conformances.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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 DynamicActorIsolation -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-upcoming-feature DynamicActorIsolation -strict-concurrency=complete -verify-additional-prefix complete-tns-
22

33
// REQUIRES: concurrency
44
// REQUIRES: asserts

test/Interpreter/preconcurrency_conformances.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
// RUN: -target %target-cpu-apple-macosx10.15 \
1313
// RUN: -I %t -L %t -l Interface \
1414
// RUN: -emit-module-interface-path %t/Types.swiftinterface \
15-
// RUN: -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation
15+
// RUN: -Xfrontend -enable-upcoming-feature -Xfrontend DynamicActorIsolation
1616

17-
// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash1.swift -o %t/crash1.out
17+
// RUN: %target-build-swift -Xfrontend -enable-upcoming-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash1.swift -o %t/crash1.out
1818
// RUN: %target-codesign %t/crash1.out
1919
// RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash1.out 2>&1 | %FileCheck %t/src/Crash1.swift
2020

21-
// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash2.swift -o %t/crash2.out
21+
// RUN: %target-build-swift -Xfrontend -enable-upcoming-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash2.swift -o %t/crash2.out
2222
// RUN: %target-codesign %t/crash2.out
2323
// RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash2.out 2>&1 | %FileCheck %t/src/Crash2.swift
2424

25-
// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash3.swift -o %t/crash3.out
25+
// RUN: %target-build-swift -Xfrontend -enable-upcoming-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash3.swift -o %t/crash3.out
2626
// RUN: %target-codesign %t/crash3.out
2727
// RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash3.out 2>&1 | %FileCheck %t/src/Crash3.swift
2828

29-
// RUN: %target-build-swift -Xfrontend -enable-experimental-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash4.swift -o %t/crash4.out
29+
// RUN: %target-build-swift -Xfrontend -enable-upcoming-feature -Xfrontend DynamicActorIsolation -I %t -L %t -l Types %t/src/Crash4.swift -o %t/crash4.out
3030
// RUN: %target-codesign %t/crash4.out
3131
// RUN: not --crash env SWIFT_UNEXPECTED_EXECUTOR_LOG_LEVEL=2 %target-run %t/crash4.out 2>&1 | %FileCheck %t/src/Crash4.swift
3232

test/ModuleInterface/preconcurrency_conformances.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
// RUN: -module-name Client -I %t -swift-version 5 -enable-library-evolution \
1313
// RUN: -emit-module-path %t/Client.swiftmodule \
1414
// RUN: -emit-module-interface-path %t/Client.swiftinterface \
15-
// RUN: -enable-experimental-feature DynamicActorIsolation \
15+
// RUN: -enable-upcoming-feature DynamicActorIsolation \
1616
// RUN: -disable-availability-checking \
1717
// RUN: -verify
1818

1919
// RUN: %FileCheck %s < %t/Client.swiftinterface
2020

2121
// RUN: %target-swift-emit-module-interface(%t/Client.swiftinterface) -I %t %t/src/Client.swift -module-name Client \
22-
// RUN: -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -verify
22+
// RUN: -disable-availability-checking -enable-upcoming-feature DynamicActorIsolation -verify
2323

2424
// RUN: %target-swift-typecheck-module-from-interface(%t/Client.swiftinterface) -I %t -module-name Client \
25-
// RUN: -disable-availability-checking -enable-experimental-feature DynamicActorIsolation -verify
25+
// RUN: -disable-availability-checking -enable-upcoming-feature DynamicActorIsolation -verify
2626

2727
// REQUIRES: asserts
2828
// REQUIRES: concurrency

test/SILGen/preconcurrency_conformances.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-emit-silgen -disable-availability-checking -module-name preconcurrency_conformances -enable-experimental-feature DynamicActorIsolation %s -verify | %FileCheck %s
1+
// RUN: %target-swift-emit-silgen -disable-availability-checking -module-name preconcurrency_conformances -enable-upcoming-feature DynamicActorIsolation %s -verify | %FileCheck %s
22

33
// REQUIRES: asserts
44
// REQUIRES: concurrency

test/SILGen/preconcurrency_conformances_backdeploy.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend -primary-file %s -target %target-cpu-apple-macosx10.14 -enable-experimental-feature DynamicActorIsolation -emit-silgen -o - | %FileCheck %s
1+
// RUN: %target-swift-frontend -primary-file %s -target %target-cpu-apple-macosx10.14 -enable-upcoming-feature DynamicActorIsolation -emit-silgen -o - | %FileCheck %s
22

33
// REQUIRES: asserts
44
// REQUIRES: concurrency

0 commit comments

Comments
 (0)