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] Treat explicit "nonisolated" like implicit "nonisolated" on protocols

Browse Source 
Make explicit "nonisolated" also not special on protocols, so a
nonisolated protocol does not suppress default isolation.
SendableMetatype is the proper way to suppress default isolation for a
protocol.

Unfortunately, these rules made it appear like issue #82168
was fixed, when in fact it was not. Keep the test case, but as a
failing test, and we'll investigate separately.
This commit is contained in:
Doug Gregor
2025-07-25 09:23:52 -07:00
parent 5abbf2e4c9
commit 20a10c618e
3 changed files with 87 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
lib/Sema/TypeCheckConcurrency.cpp
View File

@@ -5301,6 +5301,33 @@ getIsolationFromAttributes(const Decl *decl, bool shouldDiagnose = true,
llvm_unreachable("Forgot about an attribute?");
}
/// Determine the default isolation for the given declaration context.
static DefaultIsolation getDefaultIsolationForContext(const DeclContext *dc) {
// Check whether there is a file-specific setting.
if (auto *sourceFile = dc->getParentSourceFile()) {
if (auto defaultIsolationInFile = sourceFile->getDefaultIsolation())
return defaultIsolationInFile.value();
}
// If we're in the main module, check the language option.
ASTContext &ctx = dc->getASTContext();
if (dc->getParentModule() == ctx.MainModule)
return ctx.LangOpts.DefaultIsolationBehavior;
// Otherwise, default to nonisolated.
return DefaultIsolation::Nonisolated;
}
/// Determines whether explicit 'nonisolated' is different from 'unspecified'
/// in the given context.
static bool explicitNonisolatedIsSpecial(const DeclContext *dc) {
ASTContext &ctx = dc->getASTContext();
if (ctx.LangOpts.hasFeature(Feature::NoExplicitNonIsolated))
return false;
return getDefaultIsolationForContext(dc) == DefaultIsolation::Nonisolated;
}
/// Infer isolation from witnessed protocol requirements.
static std::optional<InferredActorIsolation>
getIsolationFromWitnessedRequirements(ValueDecl *value) {
@@ -5317,11 +5344,13 @@ getIsolationFromWitnessedRequirements(ValueDecl *value) {
if (dc->getSelfProtocolDecl())
return std::nullopt;
// Prevent isolation inference from requirements if the conforming type
// has an explicit `nonisolated` attribute.
if (auto *NTD = dc->getSelfNominalTypeDecl()) {
if (NTD->getAttrs().hasAttribute<NonisolatedAttr>())
return std::nullopt;
if (explicitNonisolatedIsSpecial(dc)) {
// Prevent isolation inference from requirements if the conforming type
// has an explicit `nonisolated` attribute.
if (auto *NTD = dc->getSelfNominalTypeDecl()) {
if (NTD->getAttrs().hasAttribute<NonisolatedAttr>())
return std::nullopt;
}
}
// Walk through each of the conformances in this context, collecting any
@@ -5379,8 +5408,13 @@ getIsolationFromWitnessedRequirements(ValueDecl *value) {
}
case ActorIsolation::GlobalActor:
break;
case ActorIsolation::Nonisolated:
case ActorIsolation::NonisolatedUnsafe:
if (!explicitNonisolatedIsSpecial(requirement->getDeclContext()))
continue;
break;
}
@@ -5488,7 +5522,8 @@ getIsolationFromConformances(NominalTypeDecl *nominal) {
case ActorIsolation::NonisolatedUnsafe:
break;
case ActorIsolation::Nonisolated:
if (inferredIsolation.source.kind == IsolationSource::Kind::Explicit) {
if (inferredIsolation.source.kind == IsolationSource::Kind::Explicit &&
explicitNonisolatedIsSpecial(nominal)) {
if (!foundIsolation) {
// We found an explicitly 'nonisolated' protocol.
foundIsolation = {
@@ -6109,23 +6144,6 @@ static bool sendableConformanceRequiresNonisolated(NominalTypeDecl *nominal) {
return requiresNonisolated;
}
/// Determine the default isolation for the given declaration context.
static DefaultIsolation getDefaultIsolationForContext(const DeclContext *dc) {
// Check whether there is a file-specific setting.
if (auto *sourceFile = dc->getParentSourceFile()) {
if (auto defaultIsolationInFile = sourceFile->getDefaultIsolation())
return defaultIsolationInFile.value();
}
// If we're in the main module, check the language option.
ASTContext &ctx = dc->getASTContext();
if (dc->getParentModule() == ctx.MainModule)
return ctx.LangOpts.DefaultIsolationBehavior;
// Otherwise, default to nonisolated.
return DefaultIsolation::Nonisolated;
}
/// Determine the default isolation and isolation source for this declaration,
/// which may still be overridden by other inference rules.
static std::tuple<InferredActorIsolation, ValueDecl *,
@@ -6321,12 +6339,9 @@ static bool shouldSelfIsolationOverrideDefault(
if (isa<NominalTypeDecl>(dc))
return true;
// The NoExplicitNonIsolated feature
if (ctx.LangOpts.hasFeature(Feature::NoExplicitNonIsolated))
return false;
// Suppress when the default isolation is nonisolated.
return getDefaultIsolationForContext(dc) == DefaultIsolation::Nonisolated;
/// Only allow explicit nonisolated to override the default when it's
/// treated as special.
return explicitNonisolatedIsSpecial(dc);
}
}