Merge pull request #35275 from DougGregor/looser-override-witness-isolation-objc

Author: DougGregor

lib/Sema/TypeCheckConcurrency.cpp

@@ -2016,6 +2016,12 @@ void swift::checkOverrideActorIsolation(ValueDecl *value) {
   if (isolation == overriddenIsolation)
     return;
 
+  // If the overridden declaration is from Objective-C with no actor annotation,
+  // and the overriding declaration has been placed in a global actor, allow it.
+  if (overridden->hasClangNode() && !overriddenIsolation &&
+      isolation.getKind() == ActorIsolation::GlobalActor)
+    return;
+
   // Isolation mismatch. Diagnose it.
   value->diagnose(
       diag::actor_isolation_override_mismatch, isolation,

lib/Sema/TypeCheckProtocol.cpp

@@ -2739,7 +2739,11 @@ bool ConformanceChecker::checkActorIsolation(
 
   // If the witness has a global actor but the requirement does not, we have
   // an isolation error.
-  if (witnessGlobalActor && !requirementGlobalActor) {
+  //
+  // However, we allow this case when the requirement was imported, because
+  // it might not have been annotated.
+  if (witnessGlobalActor && !requirementGlobalActor &&
+      !requirement->hasClangNode()) {
     witness->diagnose(
         diag::global_actor_isolated_witness, witness->getDescriptiveKind(),
         witness->getName(), witnessGlobalActor, Proto->getName());

test/decl/protocol/conforms/objc_async.swift

@@ -3,6 +3,7 @@
 // REQUIRES: objc_interop
 // REQUIRES: concurrency
 import Foundation
+import ObjectiveC
 import ObjCConcurrency
 
 // Conform via async method
@@ -51,3 +52,22 @@ extension C5: ConcurrentProtocol {
     completionHandler?("hello")
   }
 }
+
+// Global actors.
+actor class SomeActor { }
+
+@globalActor
+struct SomeGlobalActor {
+  static let shared = SomeActor()
+}
+
+class C6: ConcurrentProtocol {
+  @SomeGlobalActor
+  func askUser(toSolvePuzzle puzzle: String) async throws -> String { "" }
+
+  func askUser(toJumpThroughHoop hoop: String) async -> String { "hello" }
+}
+
+class C7: NSObject {
+  @SomeGlobalActor override var description: String { "on an actor" }
+}