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-0466] Enable SendableProhibitsMainActorInference by default

Browse Source 
This implements the SE-0466 amendment under discussion for all code
with default main-actor isolation.

Finalizes rdar://151029300.
This commit is contained in:
Doug Gregor
2025-07-09 10:44:39 -07:00
parent 1cc5a865a5
commit 457d44c624
6 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,10 +530,6 @@ EXPERIMENTAL_FEATURE(DefaultIsolationPerFile, false)
/// Enable @_lifetime attribute
SUPPRESSIBLE_EXPERIMENTAL_FEATURE(Lifetimes, true)
/// Disable @MainActor inference when the primary definition of a type conforms
/// to SendableMetatype (or Sendable).
EXPERIMENTAL_FEATURE(SendableProhibitsMainActorInference, true)
#undef EXPERIMENTAL_FEATURE_EXCLUDED_FROM_MODULE_INTERFACE
#undef EXPERIMENTAL_FEATURE
#undef UPCOMING_FEATURE

1
lib/AST/FeatureSet.cpp
View File

@@ -127,7 +127,6 @@ UNINTERESTING_FEATURE(MacrosOnImports)
UNINTERESTING_FEATURE(ExtensibleEnums)
UNINTERESTING_FEATURE(NonisolatedNonsendingByDefault)
UNINTERESTING_FEATURE(KeyPathWithMethodMembers)
UNINTERESTING_FEATURE(SendableProhibitsMainActorInference)
static bool usesFeatureNonescapableTypes(Decl *decl) {
auto containsNonEscapable =

12
lib/Sema/DerivedConformance/DerivedConformanceCodable.cpp
View File

@@ -155,18 +155,6 @@ addImplicitCodingKeys(NominalTypeDecl *target,
enumDecl->setSynthesized();
enumDecl->setAccess(AccessLevel::Private);
if (!C.LangOpts.hasFeature(Feature::SendableProhibitsMainActorInference)) {
switch (C.LangOpts.DefaultIsolationBehavior) {
case DefaultIsolation::MainActor:
enumDecl->getAttrs().add(NonisolatedAttr::createImplicit(C));
break;
case DefaultIsolation::Nonisolated:
// Nothing to do.
break;
}
}
// For classes which inherit from something Encodable or Decodable, we
// provide case `super` as the first key (to be used in encoding super).
auto *classDecl = dyn_cast<ClassDecl>(target);

3
lib/Sema/TypeCheckConcurrency.cpp
View File

@@ -6010,9 +6010,6 @@ static void addAttributesForActorIsolation(ValueDecl *value,
/// be nonisolated (preventing @MainActor inference).
static bool sendableConformanceRequiresNonisolated(NominalTypeDecl *nominal) {
ASTContext &ctx = nominal->getASTContext();
if (!ctx.LangOpts.hasFeature(Feature::SendableProhibitsMainActorInference))
return false;
if (isa<ProtocolDecl>(nominal))
return false;

6
test/Concurrency/assume_mainactor_typechecker_errors_sendablecheck.swift
View File

@@ -1,7 +1,5 @@
// RUN: %target-swift-frontend -swift-version 5 -emit-sil -default-isolation MainActor %s -verify -verify-additional-prefix swift5- -enable-experimental-feature SendableProhibitsMainActorInference
// RUN: %target-swift-frontend -swift-version 6 -emit-sil -default-isolation MainActor %s -verify -verify-additional-prefix swift6- -enable-experimental-feature SendableProhibitsMainActorInference
// REQUIRES: swift_feature_SendableProhibitsMainActorInference
// RUN: %target-swift-frontend -swift-version 5 -emit-sil -default-isolation MainActor %s -verify -verify-additional-prefix swift5-
// RUN: %target-swift-frontend -swift-version 6 -emit-sil -default-isolation MainActor %s -verify -verify-additional-prefix swift6-
// Ensure that a Sendable-conforming protocol suppresses @MainActor inference
// for a type.

4
test/Macros/default_main_actor_nonisolated.swift
View File

@@ -4,9 +4,7 @@
// RUN: %host-build-swift -swift-version 5 -emit-library -o %t/%target-library-name(MacroDefinition) -module-name=MacroDefinition %S/Inputs/syntax_macro_definitions.swift -g -no-toolchain-stdlib-rpath
// Check for errors
// RUN: %target-swift-frontend -swift-version 5 -typecheck -load-plugin-library %t/%target-library-name(MacroDefinition) %s -I %t -disable-availability-checking -swift-version 6 -default-isolation MainActor -enable-experimental-feature SendableProhibitsMainActorInference
// REQUIRES: swift_feature_SendableProhibitsMainActorInference
// RUN: %target-swift-frontend -swift-version 5 -typecheck -load-plugin-library %t/%target-library-name(MacroDefinition) %s -I %t -disable-availability-checking -swift-version 6 -default-isolation MainActor
@attached(extension, conformances: Sendable)
macro AddSendable() = #externalMacro(module: "MacroDefinition", type: "SendableMacro")