Merge pull request #66974 from DougGregor/se-0401-property-wrapper-isolation-disable

Author: DougGregor

include/swift/Basic/Features.def

@@ -113,6 +113,7 @@ UPCOMING_FEATURE(ForwardTrailingClosures, 286, 6)
 UPCOMING_FEATURE(BareSlashRegexLiterals, 354, 6)
 UPCOMING_FEATURE(ExistentialAny, 335, 6)
 UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
+UPCOMING_FEATURE(DisableActorInferenceFromPropertyWrapperUsage, 0, 6)
 
 EXPERIMENTAL_FEATURE(StaticAssert, false)
 EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)

lib/AST/ASTPrinter.cpp

@@ -3351,6 +3351,10 @@ static bool usesFeatureFreestandingExpressionMacros(Decl *decl) {
   return macro->getMacroRoles().contains(MacroRole::Expression);
 }
 
+static bool usesFeatureDisableActorInferenceFromPropertyWrapperUsage(Decl *decl) {
+  return false;
+}
+
 static void
 suppressingFeatureNoAsyncAvailability(PrintOptions &options,
                                       llvm::function_ref<void()> action) {

lib/Sema/TypeCheckConcurrency.cpp

@@ -3655,8 +3655,15 @@ static Optional<ActorIsolation> getIsolationFromWrappers(
     return None;
 
   if (!nominal->getParentSourceFile())
-    return None;
-  
+    return llvm::None;
+
+  ASTContext &ctx = nominal->getASTContext();
+  if (ctx.LangOpts.hasFeature(Feature::DisableActorInferenceFromPropertyWrapperUsage)) {
+    // In Swift 6, we no longer infer isolation of a nominal type
+    // based on the property wrappers used in its stored properties
+    return llvm::None;
+  }
+
   Optional<ActorIsolation> foundIsolation;
   for (auto member : nominal->getMembers()) {
     auto var = dyn_cast<VarDecl>(member);
@@ -4270,8 +4277,8 @@ ActorIsolation ActorIsolationRequest::evaluate(
         if (auto inferred = inferredIsolation(*conformanceIsolation))
           return inferred;
 
-      // If the declaration is a nominal type and any property wrappers on
-      // its stored properties require isolation, use that.
+      // Before Swift 6: If the declaration is a nominal type and any property
+      // wrappers on its stored properties require isolation, use that.
       if (auto wrapperIsolation = getIsolationFromWrappers(nominal)) {
         if (auto inferred = inferredIsolation(*wrapperIsolation))
           return inferred;

test/Concurrency/global_actor_inference_swift6.swift

@@ -78,7 +78,7 @@ struct HasMainActorWrappedProp {
 
   var plainStorage: Int
 
-  var computedProp: Int { 0 } // expected-note {{property declared here}}
+  var computedProp: Int { 0 }
 
   nonisolated func testErrors() {
     _ = thing // expected-error {{main actor-isolated property 'thing' can not be referenced from a non-isolated context}}
@@ -89,7 +89,7 @@ struct HasMainActorWrappedProp {
 
     _ = plainStorage
 
-    _ = computedProp // expected-error {{main actor-isolated property 'computedProp' can not be referenced from a non-isolated context}}
+    _ = computedProp
   }
 }