averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Concurrency] Add ApproachableConcurrency as a pseudo upcoming feature flag

Browse Source 
Enables upcoming features that aim to provide a more approachable path to Swift Concurrency:
 - `DisableOutwardActorInference`
 - `GlobalActorIsolatedTypesUsability`
 - `InferIsolatedConformances`
 - `InferSendableFromCaptures`
 - `NonisolatedNonsendingByDefault`

Resolves: rdar://166244164
This commit is contained in:
Pavel Yaskevich
2025-12-10 14:20:09 -08:00
parent f9c064d161
commit 6526dca9db
3 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Frontend/CompilerInvocation.cpp
View File

@@ -852,6 +852,12 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
continue;
}
if (isUpcomingFeatureFlag &&
argValue.compare("ApproachableConcurrency") == 0) {
psuedoFeatures.push_back(argValue);
continue;
}
// For all other features, the argument format is `<name>[:migrate]`.
StringRef featureName;
std::optional<StringRef> featureMode;
@@ -968,6 +974,15 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
continue;
}
if (featureName->compare("ApproachableConcurrency") == 0) {
Opts.enableFeature(Feature::DisableOutwardActorInference);
Opts.enableFeature(Feature::GlobalActorIsolatedTypesUsability);
Opts.enableFeature(Feature::InferIsolatedConformances);
Opts.enableFeature(Feature::InferSendableFromCaptures);
Opts.enableFeature(Feature::NonisolatedNonsendingByDefault);
continue;
}
// Hack: In order to support using availability macros in SPM packages, we
// need to be able to use:
// .enableExperimentalFeature("AvailabilityMacro='...'")

40
test/Concurrency/approachable_concurrency.swift Normal file
View File

@@ -0,0 +1,40 @@
// RUN: %target-swift-emit-silgen %s -verify -enable-upcoming-feature ApproachableConcurrency -default-isolation MainActor | %FileCheck %s
// REQUIRES: concurrency
struct S {
func test() {
}
}
func takesSendable<T: Sendable>(_: T) {}
// CHECK-LABEL: sil hidden [ossa] @$s24approachable_concurrency21testSendableInference1syAA1SV_tF : $@convention(thin) (S) -> ()
// CHECK: function_ref @$s24approachable_concurrency21testSendableInference1syAA1SV_tFyyYbcAEYbcfu_ : $@convention(thin) @Sendable (S) -> @owned @Sendable @callee_guaranteed () -> ()
// CHECK: } // end sil function '$s24approachable_concurrency21testSendableInference1syAA1SV_tF'
func testSendableInference(s: S) {
takesSendable(s.test)
}
// CHECK-LABEL: sil hidden [ossa] @$s24approachable_concurrency25testNonisolatedNonSendingyyyyYaYCXEYaF : $@convention(thin) @async (@guaranteed @noescape @async @callee_guaranteed (@sil_isolated @sil_implicit_leading_param @guaranteed Builtin.ImplicitActor) -> ()) -> ()
func testNonisolatedNonSending(_: () async -> Void) async {
}
// GlobalActorIsolatedTypesUsability
@MainActor
struct GAITU {
nonisolated var x: Int = 0
}
extension GAITU: Equatable {
static nonisolated func ==(lhs: GAITU, rhs: GAITU) -> Bool {
return lhs.x == rhs.x // okay
}
}
// CHECK: // static IsolatedConformances.__derived_struct_equals(_:_:)
// CHECK-NEXT: // Isolation: global_actor. type: MainActor
// CHECK-LABEL: sil hidden [ossa] @$s24approachable_concurrency20IsolatedConformancesV23__derived_struct_equalsySbAC_ACtFZ : $@convention(method) (IsolatedConformances, IsolatedConformances, @thin IsolatedConformances.Type) -> Bool
struct IsolatedConformances: Equatable {
let x: Int = 0
}

2
test/Misc/verify-swift-feature-testing.test-sh
View File

@@ -27,6 +27,8 @@ EXCEPTIONAL_FILES = [
pathlib.Path("test/attr/feature_requirement.swift"),
# Tests completion with features both enabled and disabled
pathlib.Path("test/IDE/complete_decl_attribute_feature_requirement.swift"),
# Uses the pseudo-feature ApproachableConcurrency
pathlib.Path("test/Concurrency/approachable_concurrency.swift"),
]
ENABLE_FEATURE_RE = re.compile(