Skip to content

Commit 48fd54d

Browse files
gottesmmgottesmm
authored
Merge pull request #72102 from gottesmm/pr-3efb1999c4f3d6daa07797812c8020317a043c8d
[region-isolation] Make RegionBasedIsolation an upcoming feature for swift 6.
2 parents 26df3a3 + 99e3f7f commit 48fd54d

File tree

113 files changed

+132
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+132
-121
lines changed

‎include/swift/Basic/Features.def‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ UPCOMING_FEATURE(IsolatedDefaultValues, 411, 6)
182182
UPCOMING_FEATURE(GlobalConcurrency, 412, 6)
183183
UPCOMING_FEATURE(InferSendableFromCaptures, 418, 6)
184184
UPCOMING_FEATURE(ImplicitOpenExistentials, 352, 6)
185+
UPCOMING_FEATURE(RegionBasedIsolation, 414, 6)
185186

186187
// Swift 7
187188
UPCOMING_FEATURE(ExistentialAny, 335, 7)
@@ -275,9 +276,6 @@ EXPERIMENTAL_FEATURE(ReferenceBindings, true)
275276
/// Enable the explicit 'import Builtin' and allow Builtin usage.
276277
EXPERIMENTAL_FEATURE(BuiltinModule, true)
277278

278-
/// Region Based Isolation testing using the TransferNonSendable pass
279-
EXPERIMENTAL_FEATURE(RegionBasedIsolation, true)
280-
281279
/// Enable extended callbacks (with additional parameters) to be used when the
282280
/// "playground transform" is enabled.
283281
EXPERIMENTAL_FEATURE(PlaygroundExtendedCallbacks, true)

‎lib/DriverTool/sil_opt_main.cpp‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,10 @@ struct SILOptOptions {
223223
ExperimentalFeatures = llvm::cl::list<std::string>("enable-experimental-feature",
224224
llvm::cl::desc("Enable the given experimental feature."));
225225

226+
llvm::cl::list<std::string> UpcomingFeatures = llvm::cl::list<std::string>(
227+
"enable-upcoming-feature",
228+
llvm::cl::desc("Enable the given upcoming feature."));
229+
226230
llvm::cl::opt<bool>
227231
EnableExperimentalConcurrency = llvm::cl::opt<bool>("enable-experimental-concurrency",
228232
llvm::cl::desc("Enable experimental concurrency model."));
@@ -652,11 +656,20 @@ int sil_opt_main(ArrayRef<const char *> argv, void *MainAddr) {
652656
options.BypassResilienceChecks;
653657
Invocation.getDiagnosticOptions().PrintDiagnosticNames =
654658
options.DebugDiagnosticNames;
659+
for (auto &featureName : options.UpcomingFeatures) {
660+
if (auto feature = getUpcomingFeature(featureName)) {
661+
Invocation.getLangOptions().enableFeature(*feature);
662+
} else {
663+
llvm::errs() << "error: unknown upcoming feature "
664+
<< QuotedString(featureName) << "\n";
665+
exit(-1);
666+
}
667+
}
655668
for (auto &featureName : options.ExperimentalFeatures) {
656669
if (auto feature = getExperimentalFeature(featureName)) {
657670
Invocation.getLangOptions().enableFeature(*feature);
658671
} else {
659-
llvm::errs() << "error: unknown feature "
672+
llvm::errs() << "error: unknown experimental feature "
660673
<< QuotedString(featureName) << "\n";
661674
exit(-1);
662675
}

‎test/Concurrency/LLDBDebuggerFunctionActorExtension.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -disable-availability-checking -debugger-support %s -emit-sil -o /dev/null -verify
22
// RUN: %target-swift-frontend -disable-availability-checking -debugger-support %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted
33
// RUN: %target-swift-frontend -disable-availability-checking -debugger-support %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
4-
// RUN: %target-swift-frontend -disable-availability-checking -debugger-support %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
4+
// RUN: %target-swift-frontend -disable-availability-checking -debugger-support %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
55

66
// REQUIRES: concurrency
77
// REQUIRES: asserts

‎test/Concurrency/actor_call_implicitly_async.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %target-swift-frontend -disable-availability-checking -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -verify-additional-prefix complete-
2-
// RUN: %target-swift-frontend -disable-availability-checking -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -enable-experimental-feature RegionBasedIsolation
2+
// RUN: %target-swift-frontend -disable-availability-checking -strict-concurrency=complete -parse-as-library %s -emit-sil -o /dev/null -verify -enable-upcoming-feature RegionBasedIsolation
33

44
// REQUIRES: concurrency
55
// REQUIRES: asserts

‎test/Concurrency/actor_defer.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -parse-as-library -emit-sil -DNEGATIVES -verify %s
22
// RUN: %target-swift-frontend -parse-as-library -emit-sil -DNEGATIVES -verify %s -strict-concurrency=targeted
33
// RUN: %target-swift-frontend -parse-as-library -emit-sil -DNEGATIVES -verify %s -strict-concurrency=complete
4-
// RUN: %target-swift-frontend -parse-as-library -emit-sil -DNEGATIVES -verify %s -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
4+
// RUN: %target-swift-frontend -parse-as-library -emit-sil -DNEGATIVES -verify %s -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
55

66
// RUN: %target-swift-frontend -parse-as-library -emit-sil -enable-actor-data-race-checks -o - %s | %FileCheck %s
77

‎test/Concurrency/actor_derived_conformances.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify
22
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted
33
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
4-
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
4+
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
55

66
// REQUIRES: concurrency
77
// REQUIRES: asserts

‎test/Concurrency/actor_existentials.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify
22
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted
33
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
4-
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
4+
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
55

66
// REQUIRES: concurrency
77
// REQUIRES: asserts

‎test/Concurrency/actor_inout_isolation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-additional-prefix minimal-targeted-
22
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-additional-prefix targeted-complete-tns- -verify-additional-prefix targeted-complete- -verify-additional-prefix minimal-targeted- -strict-concurrency=targeted
33
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-additional-prefix targeted-complete-tns- -verify-additional-prefix targeted-complete- -verify-additional-prefix complete-tns- -verify-additional-prefix complete- -strict-concurrency=complete
4-
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-additional-prefix targeted-complete-tns- -verify-additional-prefix complete-tns- -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
4+
// RUN: %target-swift-frontend -disable-availability-checking %s -emit-sil -o /dev/null -verify -verify-additional-prefix targeted-complete-tns- -verify-additional-prefix complete-tns- -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
55

66
// REQUIRES: concurrency
77
// REQUIRES: asserts

‎test/Concurrency/actor_isolation.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %target-swift-frontend -emit-module -emit-module-path %t/OtherActors.swiftmodule -module-name OtherActors %S/Inputs/OtherActors.swift -disable-availability-checking
44

55
// RUN: %target-swift-frontend -I %t -disable-availability-checking -strict-concurrency=complete -parse-as-library -emit-sil -o /dev/null -verify %s
6-
// RUN: %target-swift-frontend -I %t -disable-availability-checking -strict-concurrency=complete -parse-as-library -emit-sil -o /dev/null -verify -enable-experimental-feature RegionBasedIsolation %s
6+
// RUN: %target-swift-frontend -I %t -disable-availability-checking -strict-concurrency=complete -parse-as-library -emit-sil -o /dev/null -verify -enable-upcoming-feature RegionBasedIsolation %s
77

88
// REQUIRES: concurrency
99
// REQUIRES: asserts

‎test/Concurrency/actor_isolation_cycle.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify
22
// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify -strict-concurrency=targeted
33
// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify -strict-concurrency=complete
4-
// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-experimental-feature RegionBasedIsolation
4+
// RUN: %target-swift-frontend %s -emit-sil -o /dev/null -verify -strict-concurrency=complete -enable-upcoming-feature RegionBasedIsolation
55

66
// REQUIRES: concurrency
77
// REQUIRES: asserts

0 commit comments

Comments
 (0)