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

[SE-0470] Enable isolated conformances by default

Browse Source 
The IsolatedConformances feature moves to a normal, supported feature.
Remove all of the experimental-feature flags on test cases and such.

The InferIsolatedConformances feature moves to an upcoming feature for
Swift 7. This should become an adoptable feature, adding "nonisolated"
where needed.

(cherry picked from commit 3380331e7e)
This commit is contained in:
Doug Gregor
2025-04-09 16:06:14 -07:00
parent 69758f6213
commit 5e29333d6b
19 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
CHANGELOG.md
View File

@@ -32,6 +32,34 @@
strategy, given that the code would eventually become ambiguous anyways when strategy, given that the code would eventually become ambiguous anyways when
the deployment target is raised. the deployment target is raised.
* [SE-0470][]:
A protocol conformance can be isolated to a specific global actor, meaning that the conformance can only be used by code running on that actor. Isolated conformances are expressed by specifying the global actor on the conformance itself:
```swift
protocol P {
func f()
}
@MainActor
class MyType: @MainActor P {
/*@MainActor*/ func f() {
// must be called on the main actor
}
}
```
Swift will produce diagnostics if the conformance is directly accessed in code that isn't guaranteed to execute in the same global actor. For example:
```swift
func acceptP<T: P>(_ value: T) { }
/*nonisolated*/ func useIsolatedConformance(myType: MyType) {
acceptP(myType) // error: main actor-isolated conformance of 'MyType' to 'P' cannot be used in nonisolated context
}
```
To address such issues, only use an isolated conformance from code that executes on the same global actor.
* [SE-0419][]: * [SE-0419][]:
Introduced the new `Runtime` module, which contains a public API that can Introduced the new `Runtime` module, which contains a public API that can
generate backtraces, presently supported on macOS and Linux. Capturing a generate backtraces, presently supported on macOS and Linux. Capturing a
@@ -10759,6 +10787,7 @@ using the `.dynamicType` member to retrieve the type of an expression should mig
[SE-0442]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0442-allow-taskgroup-childtaskresult-type-to-be-inferred.md [SE-0442]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0442-allow-taskgroup-childtaskresult-type-to-be-inferred.md
[SE-0444]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md [SE-0444]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
[SE-0458]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0458-strict-memory-safety.md [SE-0458]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0458-strict-memory-safety.md
[SE-0470]: https://github.com/swiftlang/swift-evolution/blob/main/proposals/0470-isolated-conformances.md
[#64927]: <https://github.com/apple/swift/issues/64927> [#64927]: <https://github.com/apple/swift/issues/64927>
[#42697]: <https://github.com/apple/swift/issues/42697> [#42697]: <https://github.com/apple/swift/issues/42697>
[#42728]: <https://github.com/apple/swift/issues/42728> [#42728]: <https://github.com/apple/swift/issues/42728>

4
include/swift/AST/DiagnosticsSema.def
View File

@@ -8486,10 +8486,6 @@ ERROR(attr_abi_failable_mismatch,none,
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// MARK: Isolated conformances // MARK: Isolated conformances
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
GROUPED_ERROR(isolated_conformance_experimental_feature,IsolatedConformances,
none,
"isolated conformances require experimental feature "
" 'IsolatedConformances'", ())
NOTE(note_isolate_conformance_to_global_actor,none, NOTE(note_isolate_conformance_to_global_actor,none,
"isolate this conformance to the %select{global actor %0|main actor}1 " "isolate this conformance to the %select{global actor %0|main actor}1 "
"with '@%2'", (Type, bool, StringRef)) "with '@%2'", (Type, bool, StringRef))

5
include/swift/Basic/Features.def
View File

@@ -254,6 +254,7 @@ SUPPRESSIBLE_LANGUAGE_FEATURE(MemorySafetyAttributes, 458, "@unsafe attribute")
LANGUAGE_FEATURE(ValueGenerics, 452, "Value generics feature (integer generics)") LANGUAGE_FEATURE(ValueGenerics, 452, "Value generics feature (integer generics)")
LANGUAGE_FEATURE(RawIdentifiers, 451, "Raw identifiers") LANGUAGE_FEATURE(RawIdentifiers, 451, "Raw identifiers")
LANGUAGE_FEATURE(SendableCompletionHandlers, 463, "Objective-C completion handler parameters are imported as @Sendable") LANGUAGE_FEATURE(SendableCompletionHandlers, 463, "Objective-C completion handler parameters are imported as @Sendable")
LANGUAGE_FEATURE(IsolatedConformances, 407, "Global-actor isolated conformances")
// Swift 6 // Swift 6
UPCOMING_FEATURE(ConciseMagicFile, 274, 6) UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
@@ -276,6 +277,7 @@ UPCOMING_FEATURE(GlobalActorIsolatedTypesUsability, 0434, 6)
ADOPTABLE_UPCOMING_FEATURE(ExistentialAny, 335, 7) ADOPTABLE_UPCOMING_FEATURE(ExistentialAny, 335, 7)
UPCOMING_FEATURE(InternalImportsByDefault, 409, 7) UPCOMING_FEATURE(InternalImportsByDefault, 409, 7)
UPCOMING_FEATURE(MemberImportVisibility, 444, 7) UPCOMING_FEATURE(MemberImportVisibility, 444, 7)
UPCOMING_FEATURE(InferIsolatedConformances, 470, 7)
// Optional language features / modes // Optional language features / modes
@@ -495,6 +497,7 @@ ADOPTABLE_EXPERIMENTAL_FEATURE(AsyncCallerExecution, false)
/// Allow custom availability domains to be defined and referenced. /// Allow custom availability domains to be defined and referenced.
EXPERIMENTAL_FEATURE(CustomAvailability, true) EXPERIMENTAL_FEATURE(CustomAvailability, true)
<<<<<<< HEAD
/// Allow public enumerations to be extensible by default /// Allow public enumerations to be extensible by default
/// regardless of whether the module they are declared in /// regardless of whether the module they are declared in
/// is resilient or not. /// is resilient or not.
@@ -506,6 +509,8 @@ EXPERIMENTAL_FEATURE(IsolatedConformances, true)
/// Infer conformance isolation on global-actor-conforming types. /// Infer conformance isolation on global-actor-conforming types.
EXPERIMENTAL_FEATURE(InferIsolatedConformances, true) EXPERIMENTAL_FEATURE(InferIsolatedConformances, true)
=======
>>>>>>> 3380331e7eb ([SE-0470] Enable isolated conformances by default)
/// Allow SwiftSettings /// Allow SwiftSettings
EXPERIMENTAL_FEATURE(SwiftSettings, false) EXPERIMENTAL_FEATURE(SwiftSettings, false)

37
lib/AST/ConformanceLookup.cpp
View File

@@ -386,33 +386,30 @@ static ProtocolConformanceRef getBuiltinMetaTypeTypeConformance(
// All metatypes are Copyable, Escapable, and BitwiseCopyable. // All metatypes are Copyable, Escapable, and BitwiseCopyable.
if (auto kp = protocol->getKnownProtocolKind()) { if (auto kp = protocol->getKnownProtocolKind()) {
switch (*kp) { switch (*kp) {
case KnownProtocolKind::Sendable: case KnownProtocolKind::Sendable: {
// Metatypes are generally Sendable, but with isolated conformances we // Metatypes are generally Sendable, but with isolated conformances we
// cannot assume that metatypes based on type parameters are Sendable. // cannot assume that metatypes based on type parameters are Sendable.
// Therefore, check for conformance to SendableMetatype. // Therefore, check for conformance to SendableMetatype.
if (ctx.LangOpts.hasFeature(Feature::IsolatedConformances)) { auto sendableMetatypeProto =
auto sendableMetatypeProto = ctx.getProtocol(KnownProtocolKind::SendableMetatype);
ctx.getProtocol(KnownProtocolKind::SendableMetatype); if (sendableMetatypeProto) {
if (sendableMetatypeProto) { Type instanceType = metatypeType->getInstanceType();
Type instanceType = metatypeType->getInstanceType();
// If the instance type is a type parameter, it is not necessarily // If the instance type is a type parameter, it is not necessarily
// Sendable. There will need to be a Sendable requirement. // Sendable. There will need to be a Sendable requirement.
if (instanceType->isTypeParameter()) if (instanceType->isTypeParameter())
break; break;
// If the instance type conforms to SendableMetatype, then its // If the instance type conforms to SendableMetatype, then its
// metatype is Sendable. // metatype is Sendable.
auto instanceConformance = lookupConformance( auto instanceConformance = lookupConformance(
instanceType, sendableMetatypeProto); instanceType, sendableMetatypeProto);
if (instanceConformance.isInvalid() || if (instanceConformance.isInvalid() ||
instanceConformance.hasMissingConformance()) instanceConformance.hasMissingConformance())
break; break;
}
// Every other metatype is Sendable.
} }
LLVM_FALLTHROUGH; LLVM_FALLTHROUGH;
}
case KnownProtocolKind::Copyable: case KnownProtocolKind::Copyable:
case KnownProtocolKind::Escapable: case KnownProtocolKind::Escapable:

4
lib/Parse/ParseType.cpp
View File

@@ -163,9 +163,7 @@ ParserResult<TypeRepr> Parser::parseTypeSimple(
Diag<> MessageID, ParseTypeReason reason) { Diag<> MessageID, ParseTypeReason reason) {
ParserResult<TypeRepr> ty; ParserResult<TypeRepr> ty;
if (isParameterSpecifier() && if (isParameterSpecifier()) {
!(!Context.LangOpts.hasFeature(Feature::IsolatedConformances) &&
Tok.isContextualKeyword("isolated"))) {
// Type specifier should already be parsed before here. This only happens // Type specifier should already be parsed before here. This only happens
// for construct like 'P1 & inout P2'. // for construct like 'P1 & inout P2'.
diagnose(Tok.getLoc(), diag::attr_only_on_parameters, Tok.getRawText()); diagnose(Tok.getLoc(), diag::attr_only_on_parameters, Tok.getRawText());

7
lib/Sema/TypeCheckConcurrency.cpp
View File

@@ -3021,10 +3021,9 @@ namespace {
// FIXME: When passing to a sending parameter, should this be handled // FIXME: When passing to a sending parameter, should this be handled
// by region isolation? Or should it always be handled by region // by region isolation? Or should it always be handled by region
// isolation? // isolation?
if (ctx.LangOpts.hasFeature(Feature::IsolatedConformances) && if (mayExecuteConcurrentlyWith(
(mayExecuteConcurrentlyWith(
localFunc.getAsDeclContext(), getDeclContext()) || localFunc.getAsDeclContext(), getDeclContext()) ||
(explicitClosure && explicitClosure->isPassedToSendingParameter()))) { (explicitClosure && explicitClosure->isPassedToSendingParameter())) {
GenericSignature genericSig; GenericSignature genericSig;
if (auto afd = localFunc.getAbstractFunctionDecl()) if (auto afd = localFunc.getAbstractFunctionDecl())
genericSig = afd->getGenericSignature(); genericSig = afd->getGenericSignature();
@@ -7931,8 +7930,6 @@ ConformanceIsolationRequest::evaluate(Evaluator &evaluator, ProtocolConformance
auto dc = rootNormal->getDeclContext(); auto dc = rootNormal->getDeclContext();
ASTContext &ctx = dc->getASTContext(); ASTContext &ctx = dc->getASTContext();
if (!ctx.LangOpts.hasFeature(Feature::IsolatedConformances))
return ActorIsolation::forNonisolated(false);
// If the protocol itself is isolated, don't infer isolation for the // If the protocol itself is isolated, don't infer isolation for the
// conformance. // conformance.

10
lib/Sema/TypeCheckProtocol.cpp
View File

@@ -2567,13 +2567,6 @@ checkIndividualConformance(NormalProtocolConformance *conformance) {
ComplainLoc, diag::unchecked_conformance_not_special, ProtoType); ComplainLoc, diag::unchecked_conformance_not_special, ProtoType);
} }
// Complain if the global-actor-isolated conformances are not enabled.
if (conformance->isIsolated() &&
!Context.LangOpts.hasFeature(Feature::IsolatedConformances)) {
Context.Diags.diagnose(
ComplainLoc, diag::isolated_conformance_experimental_feature);
}
bool allowImpliedConditionalConformance = false; bool allowImpliedConditionalConformance = false;
if (Proto->isSpecificProtocol(KnownProtocolKind::Sendable)) { if (Proto->isSpecificProtocol(KnownProtocolKind::Sendable)) {
// In -swift-version 5 mode, a conditional conformance to a protocol can imply // In -swift-version 5 mode, a conditional conformance to a protocol can imply
@@ -4978,8 +4971,7 @@ static void diagnoseConformanceIsolationErrors(
} }
// Suggest isolating the conformance, if possible. // Suggest isolating the conformance, if possible.
if (ctx.LangOpts.hasFeature(Feature::IsolatedConformances) && if (potentialIsolation && potentialIsolation->isGlobalActor() &&
potentialIsolation && potentialIsolation->isGlobalActor() &&
!conformance->isIsolated()) { !conformance->isIsolated()) {
bool isMainActor = false; bool isMainActor = false;
Type globalActorIsolation = potentialIsolation->getGlobalActor(); Type globalActorIsolation = potentialIsolation->getGlobalActor();

3
test/Concurrency/Runtime/isolated_conformance.swift
View File

@@ -1,9 +1,8 @@
// RUN: %target-run-simple-swift(-enable-experimental-feature IsolatedConformances -target %target-swift-5.1-abi-triple) | %FileCheck %s // RUN: %target-run-simple-swift(-target %target-swift-5.1-abi-triple) | %FileCheck %s
// REQUIRES: executable_test // REQUIRES: executable_test
// REQUIRES: concurrency // REQUIRES: concurrency
// REQUIRES: concurrency_runtime // REQUIRES: concurrency_runtime
// REQUIRES: swift_feature_IsolatedConformances
// UNSUPPORTED: back_deployment_runtime // UNSUPPORTED: back_deployment_runtime
// FIXME: WebAssembly doesn't currently have a good way to install the // FIXME: WebAssembly doesn't currently have a good way to install the

3
test/Concurrency/isolated_conformance.swift
View File

@@ -1,6 +1,5 @@
// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 5 -strict-concurrency=complete -enable-experimental-feature IsolatedConformances %s // RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 5 -strict-concurrency=complete %s
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
protocol P { protocol P {

3
test/Concurrency/isolated_conformance_default_actor.swift
View File

@@ -1,6 +1,5 @@
// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 6 -enable-experimental-feature IsolatedConformances -default-isolation MainActor %s // RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 6 -default-isolation MainActor %s
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
nonisolated nonisolated

4
test/Concurrency/isolated_conformance_inference.swift
View File

@@ -1,7 +1,5 @@
// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 6 -enable-experimental-feature IsolatedConformances -enable-experimental-feature InferIsolatedConformances %s // RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 6 -enable-upcoming-feature InferIsolatedConformances %s
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: swift_feature_InferIsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
protocol P { protocol P {

3
test/Concurrency/sendable_metatype.swift
View File

@@ -1,7 +1,6 @@
// RUN: %target-typecheck-verify-swift -swift-version 6 -enable-experimental-feature IsolatedConformances -emit-sil -o /dev/null // RUN: %target-typecheck-verify-swift -swift-version 6 -emit-sil -o /dev/null
// REQUIRES: concurrency // REQUIRES: concurrency
// REQUIRES: swift_feature_IsolatedConformances
protocol Q { protocol Q {

3
test/Concurrency/sendable_metatype_typecheck.swift
View File

@@ -1,7 +1,6 @@
// RUN: %target-typecheck-verify-swift -swift-version 6 -enable-experimental-feature IsolatedConformances // RUN: %target-typecheck-verify-swift -swift-version 6
// REQUIRES: concurrency // REQUIRES: concurrency
// REQUIRES: swift_feature_IsolatedConformances
// This test checks for typecheck-only diagnostics involving non-sendable // This test checks for typecheck-only diagnostics involving non-sendable
// metatypes. // metatypes.

3
test/IRGen/isolated_conformance.swift
View File

@@ -1,8 +1,7 @@
// RUN: %target-swift-frontend -primary-file %s -emit-ir -swift-version 6 -enable-experimental-feature IsolatedConformances | %FileCheck %s -DINT=i%target-ptrsize // RUN: %target-swift-frontend -primary-file %s -emit-ir -swift-version 6 | %FileCheck %s -DINT=i%target-ptrsize
// REQUIRES: PTRSIZE=64 // REQUIRES: PTRSIZE=64
// REQUIRES: concurrency // REQUIRES: concurrency
// REQUIRES: swift_feature_IsolatedConformances
// UNSUPPORTED: CPU=arm64e // UNSUPPORTED: CPU=arm64e
protocol P { protocol P {

3
test/ModuleInterface/isolated_conformance.swift
View File

@@ -1,6 +1,5 @@
// RUN: %target-swift-frontend -typecheck -swift-version 6 -enable-library-evolution -module-name isolated_conformance -enable-experimental-feature IsolatedConformances -emit-module-interface-path - %s | %FileCheck %s // RUN: %target-swift-frontend -typecheck -swift-version 6 -enable-library-evolution -module-name isolated_conformance -emit-module-interface-path - %s | %FileCheck %s
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
public protocol MyProtocol { public protocol MyProtocol {

3
test/SILOptimizer/constant_propagation_casts_ossa.sil
View File

@@ -1,6 +1,5 @@
// RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation -enable-experimental-feature IsolatedConformances | %FileCheck %s // RUN: %target-sil-opt -enable-sil-verify-all %s -diagnostic-constant-propagation | %FileCheck %s
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
sil_stage canonical sil_stage canonical

6
test/SILOptimizer/isolated_conformances.swift
View File

@@ -1,14 +1,14 @@
// RUN: %empty-directory(%t) // RUN: %empty-directory(%t)
// RUN: %target-build-swift -parse-as-library -O %s -enable-experimental-feature IsolatedConformances -o %t/a.out // RUN: %target-build-swift -parse-as-library -O %s -o %t/a.out
// RUN: %target-codesign %t/a.out // RUN: %target-codesign %t/a.out
// RUN: %target-run %t/a.out | %FileCheck %s --check-prefix=CHECK-OUTPUT // RUN: %target-run %t/a.out | %FileCheck %s --check-prefix=CHECK-OUTPUT
// RUN: %target-build-swift -parse-as-library -O %s -enable-experimental-feature IsolatedConformances -Xllvm -sil-disable-pass=function-signature-opts -emit-sil | %FileCheck %s // RUN: %target-build-swift -parse-as-library -O %s -Xllvm -sil-disable-pass=function-signature-opts -emit-sil | %FileCheck %s
// REQUIRES: concurrency // REQUIRES: concurrency
// REQUIRES: executable_test // REQUIRES: executable_test
// REQUIRES: concurrency_runtime // REQUIRES: concurrency_runtime
// REQUIRES: swift_feature_IsolatedConformances // REQUIRES: OS=macosx || OS=linux-gnu
// UNSUPPORTED: back_deployment_runtime // UNSUPPORTED: back_deployment_runtime
// UNSUPPORTED: back_deploy_concurrency // UNSUPPORTED: back_deploy_concurrency

3
test/SILOptimizer/simplify_unconditional_check_cast.sil
View File

@@ -1,6 +1,5 @@
// RUN: %target-sil-opt -enable-sil-verify-all %s -simplification -simplify-instruction=unconditional_checked_cast -enable-experimental-feature IsolatedConformances | %FileCheck %s // RUN: %target-sil-opt -enable-sil-verify-all %s -simplification -simplify-instruction=unconditional_checked_cast | %FileCheck %s
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
import Swift import Swift

5
test/Serialization/isolated_conformance.swift
View File

@@ -1,9 +1,8 @@
// RUN: %empty-directory(%t) // RUN: %empty-directory(%t)
// RUN: %target-swift-frontend -emit-module -target %target-swift-5.1-abi-triple -swift-version 6 -enable-experimental-feature IsolatedConformances -o %t/def_isolated_conformance.swiftmodule %S/Inputs/def_isolated_conformance.swift // RUN: %target-swift-frontend -emit-module -target %target-swift-5.1-abi-triple -swift-version 6 -o %t/def_isolated_conformance.swiftmodule %S/Inputs/def_isolated_conformance.swift
// RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 6 -enable-experimental-feature IsolatedConformances %s -I %t // RUN: %target-swift-frontend -typecheck -verify -target %target-swift-5.1-abi-triple -swift-version 6 %s -I %t
// REQUIRES: swift_feature_IsolatedConformances
// REQUIRES: concurrency // REQUIRES: concurrency
import def_isolated_conformance import def_isolated_conformance