Merge pull request #80209 from DougGregor/infer-isolated-conformances

Implement experimental feature InferIsolatedConformances

Author: DougGregor

include/swift/Basic/Features.def

@@ -494,7 +494,6 @@ SUPPRESSIBLE_EXPERIMENTAL_FEATURE(CustomAvailability, true)
 /// Be strict about the Sendable conformance of metatypes.
 EXPERIMENTAL_FEATURE(StrictSendableMetatypes, true)
 
-
 /// Allow public enumerations to be extensible by default
 /// regardless of whether the module they are declared in
 /// is resilient or not.
@@ -503,6 +502,9 @@ EXPERIMENTAL_FEATURE(ExtensibleEnums, true)
 /// Allow isolated conformances.
 EXPERIMENTAL_FEATURE(IsolatedConformances, true)
 
+/// Infer conformance isolation on global-actor-conforming types.
+EXPERIMENTAL_FEATURE(InferIsolatedConformances, true)
+
 /// Allow SwiftSettings
 EXPERIMENTAL_FEATURE(SwiftSettings, false)
 

lib/AST/FeatureSet.cpp

@@ -332,6 +332,7 @@ UNINTERESTING_FEATURE(ReinitializeConsumeInMultiBlockDefer)
 UNINTERESTING_FEATURE(SE427NoInferenceOnExtension)
 UNINTERESTING_FEATURE(TrailingComma)
 UNINTERESTING_FEATURE(RawIdentifiers)
+UNINTERESTING_FEATURE(InferIsolatedConformances)
 
 static ABIAttr *getABIAttr(Decl *decl) {
   if (auto pbd = dyn_cast<PatternBindingDecl>(decl))

lib/Frontend/CompilerInvocation.cpp

@@ -969,6 +969,9 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_strict_memory_safety))
     Opts.enableFeature(Feature::StrictMemorySafety);
 
+  if (Opts.hasFeature(Feature::UnspecifiedMeansMainActorIsolated))
+    Opts.enableFeature(Feature::InferIsolatedConformances);
+
   return HadError;
 }
 

lib/Sema/TypeCheckConcurrency.cpp

@@ -7934,15 +7934,14 @@ ConformanceIsolationRequest::evaluate(Evaluator &evaluator, ProtocolConformance
   if (getActorIsolation(rootNormal->getProtocol()).isActorIsolated())
     return ActorIsolation::forNonisolated(false);
 
-  // In a context where we are inferring @MainActor, if the conforming type
-  // is on the main actor, then the conformance is, too.
+  // If we are inferring isolated conformances and the conforming type is
+  // isolated to a global actor,
   auto nominal = dc->getSelfNominalTypeDecl();
-  if (ctx.LangOpts.hasFeature(Feature::UnspecifiedMeansMainActorIsolated) &&
+  if (ctx.LangOpts.hasFeature(Feature::InferIsolatedConformances) &&
       nominal) {
     auto nominalIsolation = getActorIsolation(nominal);
-    if (nominalIsolation.isMainActor()) {
+    if (nominalIsolation.isGlobalActor())
       return nominalIsolation;
-    }
   }
 
   return ActorIsolation::forNonisolated(false);