Skip to content

Commit 88de4d7

Browse files
committed
[Concurrency] promote GlobalConcurrency from experimental to future feature
1 parent 1d07b01 commit 88de4d7

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ UPCOMING_FEATURE(BareSlashRegexLiterals, 354, 6)
118118
UPCOMING_FEATURE(DeprecateApplicationMain, 383, 6)
119119
UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
120120
UPCOMING_FEATURE(DisableOutwardActorInference, 401, 6)
121+
UPCOMING_FEATURE(GlobalConcurrency, 412, 6)
121122

122123
UPCOMING_FEATURE(ExistentialAny, 335, 7)
123124

@@ -221,9 +222,6 @@ EXPERIMENTAL_FEATURE(StrictConcurrency, true)
221222
/// Defer Sendable checking to SIL diagnostic phase.
222223
EXPERIMENTAL_FEATURE(SendNonSendable, false)
223224

224-
/// Within strict concurrency, narrow global variable isolation requirements.
225-
EXPERIMENTAL_FEATURE(GlobalConcurrency, false)
226-
227225
/// Allow default values to require isolation at the call-site.
228226
EXPERIMENTAL_FEATURE(IsolatedDefaultValues, false)
229227

test/Concurrency/global_variables.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-swift-frontend -emit-module -emit-module-path %t/GlobalVariables.swiftmodule -module-name GlobalVariables -parse-as-library -strict-concurrency=minimal -swift-version 5 %S/Inputs/GlobalVariables.swift
3-
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -enable-experimental-feature StrictConcurrency=complete -enable-experimental-feature GlobalConcurrency -swift-version 6 -I %t %s %s -emit-sil -o /dev/null -verify %s
3+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -swift-version 6 -I %t %s %s -emit-sil -o /dev/null -verify %s
44

55
// REQUIRES: concurrency
66
// REQUIRES: asserts

test/expr/closure/closures_swift6.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class C_56501 {
8181
}
8282
}
8383

84-
public class TestImplicitSelfForWeakSelfCapture {
84+
public final class TestImplicitSelfForWeakSelfCapture: Sendable {
8585
static let staticOptional: TestImplicitSelfForWeakSelfCapture? = .init()
8686
func method() { }
8787

0 commit comments

Comments
 (0)