Merge pull request #70725 from sophiapoirier/global-concurrency-future-feature

[Concurrency] promote GlobalConcurrency from experimental to future feature

Author: sophiapoirier

include/swift/Basic/Features.def

@@ -120,6 +120,7 @@ UPCOMING_FEATURE(DeprecateApplicationMain, 383, 6)
 UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
 UPCOMING_FEATURE(DisableOutwardActorInference, 401, 6)
 UPCOMING_FEATURE(InternalImportsByDefault, 409, 6)
+UPCOMING_FEATURE(GlobalConcurrency, 412, 6)
 UPCOMING_FEATURE(FullTypedThrows, 413, 6)
 
 UPCOMING_FEATURE(ExistentialAny, 335, 7)
@@ -217,9 +218,6 @@ EXPERIMENTAL_FEATURE(StrictConcurrency, true)
 /// Region Based Isolation testing using the TransferNonSendable pass
 EXPERIMENTAL_FEATURE(RegionBasedIsolation, false)
 
-/// Within strict concurrency, narrow global variable isolation requirements.
-EXPERIMENTAL_FEATURE(GlobalConcurrency, false)
-
 /// Allow default values to require isolation at the call-site.
 EXPERIMENTAL_FEATURE(IsolatedDefaultValues, false)
 

lib/Frontend/CompilerInvocation.cpp

@@ -880,6 +880,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   if (Opts.hasFeature(Feature::CompleteConcurrency)) {
     Opts.StrictConcurrencyLevel = StrictConcurrency::Complete;
     Opts.enableFeature(Feature::DisableOutwardActorInference);
+    Opts.enableFeature(Feature::GlobalConcurrency);
   }
 
   // Map historical flags over to experimental features. We do this for all

test/Concurrency/global_variables.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // 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
-// 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
+// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -swift-version 6 -I %t %s %s -emit-sil -o /dev/null -verify %s
 
 // REQUIRES: concurrency
 // REQUIRES: asserts

test/expr/closure/closures_swift6.swift

@@ -81,7 +81,7 @@ class C_56501 {
   }
 }
 
-public class TestImplicitSelfForWeakSelfCapture {
+public final class TestImplicitSelfForWeakSelfCapture: Sendable {
   static let staticOptional: TestImplicitSelfForWeakSelfCapture? = .init()
   func method() { }