Merge pull request #82384 from slavapestov/implied-isolated-conformance-6.2

[6.2] Sema: Expand isolated conformance inference to consider conformances to inherited protocols

Author: DougGregor

lib/Sema/TypeCheckConcurrency.cpp

@@ -8250,16 +8250,28 @@ ActorIsolation swift::inferConformanceIsolation(
     return nominalIsolation;
   }
 
-  bool anyIsolatedWitness = false;
   auto protocol = conformance->getProtocol();
-  for (auto requirement : protocol->getMembers()) {
-    if (isa<TypeDecl>(requirement))
+
+  // Also check the value witnesses of each implied conformance to every
+  // inherited protocol, recursively.
+  for (auto req : protocol->getRequirementSignature().getRequirements()) {
+    if (req.getKind() != RequirementKind::Conformance ||
+        !req.getFirstType()->isEqual(protocol->getSelfInterfaceType()))
       continue;
 
-    auto valueReq = dyn_cast<ValueDecl>(requirement);
-    if (!valueReq)
+    auto *assocConf = conformance->getAssociatedConformance(
+        req.getFirstType(), req.getProtocolDecl()).getConcrete();
+    auto isolation = assocConf->getIsolation();
+    if (isolation.isGlobalActor())
+      return isolation;
+  }
+
+  bool anyIsolatedWitness = false;
+  for (auto requirement : protocol->getProtocolRequirements()) {
+    if (isa<TypeDecl>(requirement))
       continue;
 
+    auto valueReq = cast<ValueDecl>(requirement);
     auto witness = conformance->getWitnessDecl(valueReq);
     if (!witness)
       continue;

test/Concurrency/Inputs/isolated_conformance_other.swift

@@ -0,0 +1,5 @@
+public protocol P {
+  func f()
+}
+
+public protocol PDerived: P {}

test/Concurrency/isolated_conformance_inference.swift

@@ -92,3 +92,7 @@ class InferMeDefaults {
   var someGlobalActorState: any P2.Type = DifferingConformances.self // expected-error{{global actor 'SomeGlobalActor'-isolated default value in a main actor-isolated context}}
   var bothState: any (P & P2).Type = DifferingConformances.self // expected-error{{default argument cannot be both main actor-isolated and global actor 'SomeGlobalActor'-isolated}}
 }
+
+protocol PDerived: P {}
+
+@MainActor struct ImpliedConformanceInference: PDerived { func f() {} }

test/Concurrency/isolated_conformance_inference_with_default_actor.swift

@@ -0,0 +1,9 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -emit-module-path %t/isolated_conformance_other.swiftmodule %S/Inputs/isolated_conformance_other.swift -swift-version 6
+// RUN: %target-typecheck-verify-swift -I %t -swift-version 6 -enable-upcoming-feature InferIsolatedConformances -default-isolation MainActor -swift-version 6
+// REQUIRES: swift_feature_InferIsolatedConformances
+
+import isolated_conformance_other
+
+struct S1: P { func f() {} }
+struct S2: PDerived { func f() {} }