Merge pull request swiftlang#36620 from DougGregor/limit-global-actor-propagation

[Actor isolation] Limit propagation of unsafe global actors to instance members

Author: DougGregor

lib/Sema/TypeCheckConcurrency.cpp

@@ -2674,8 +2674,16 @@ ActorIsolation ActorIsolationRequest::evaluate(
     // If the declaration is in a nominal type (or extension thereof) that
     // has isolation, use that.
     if (auto selfTypeDecl = value->getDeclContext()->getSelfNominalTypeDecl()) {
-      if (auto selfTypeIsolation = getActorIsolation(selfTypeDecl))
-        return inferredIsolation(selfTypeIsolation);
+      if (auto selfTypeIsolation = getActorIsolation(selfTypeDecl)) {
+        // Don't propagate implicit, unsafe global actor isolation from a type
+        // to non-imported instance members.
+        if (selfTypeIsolation != ActorIsolation::GlobalActorUnsafe ||
+            value->getClangNode() ||
+            (selfTypeDecl->getGlobalActorAttr() &&
+             !selfTypeDecl->getGlobalActorAttr()->first->isImplicit())) {
+          return inferredIsolation(selfTypeIsolation);
+        }
+      }
     }
   }
 

test/ClangImporter/objc_async.swift

@@ -5,7 +5,7 @@
 import Foundation
 import ObjCConcurrency
 
-@MainActor func onlyOnMainActor() { }
+@MainActor func onlyOnMainActor() { } // expected-note{{calls to global function 'onlyOnMainActor()' from outside of its actor context are implicitly asynchronous}}
 
 func testSlowServer(slowServer: SlowServer) async throws {
   let _: Int = await slowServer.doSomethingSlow("mail")
@@ -130,6 +130,8 @@ struct SomeGlobalActor {
   static let shared = SomeActor()
 }
 
+@SomeGlobalActor(unsafe) func unsafelyOnSomeGlobal() { }
+
 class MyButton : NXButton {
   @MainActor func testMain() {
     onButtonPress() // okay
@@ -139,11 +141,29 @@ class MyButton : NXButton {
     onButtonPress() // expected-error{{instance method 'onButtonPress()' isolated to global actor 'MainActor' can not be referenced from different global actor 'SomeGlobalActor'}}
   }
 
+  func test() { // expected-note{{add '@MainActor' to make instance method 'test()' part of global actor 'MainActor'}}
+    onButtonPress() // okay, onButtonPress is @MainActor(unsafe)
+    unsafelyOnSomeGlobal() // okay, we haven't opted into anything
+    onlyOnMainActor() // expected-error{{global function 'onlyOnMainActor()' isolated to global actor 'MainActor' can not be referenced from this synchronous context}}
+  }
+}
+
+class MyOtherButton: NXButton {
+  override func onButtonPress() { // expected-note{{calls to instance method 'onButtonPress()' from outside of its actor context are implicitly asynchronous}}
+    onlyOnMainActor() // yes, we're on the main actor
+    unsafelyOnSomeGlobal() // okay, we haven't opted into any actual checking
+  }
+
   func test() {
-    onButtonPress() // okay
+    onButtonPress() // okay, it's @MainActor(unsafe)
+  }
+
+  @SomeGlobalActor func testOther() {
+    onButtonPress() // expected-error{{instance method 'onButtonPress()' isolated to global actor 'MainActor' can not be referenced from different global actor 'SomeGlobalActor' in a synchronous context}}
   }
 }
 
+
 func testButtons(mb: MyButton) {
   mb.onButtonPress()
 }