Merge pull request #61759 from DougGregor/witness-matching-global-actor-cycle

Avoid concurrency-related adjustments during witness matching

Author: DougGregor

lib/Sema/ConstraintSystem.cpp

@@ -2427,8 +2427,9 @@ ConstraintSystem::getTypeOfMemberReference(
 
   // Adjust the opened type for concurrency.
   Type origOpenedType = openedType;
-  if ((isa<AbstractFunctionDecl>(value) || isa<EnumElementDecl>(value)) &&
-      !isRequirementOrWitness(locator)) {
+  if (isRequirementOrWitness(locator)) {
+    // Don't adjust when doing witness matching, because that can cause cycles.
+  } else if (isa<AbstractFunctionDecl>(value) || isa<EnumElementDecl>(value)) {
     unsigned numApplies = getNumApplications(
         value, hasAppliedSelf, functionRefKind);
     openedType = adjustFunctionTypeForConcurrency(

test/Concurrency/actor_isolation_cycle.swift

@@ -10,3 +10,20 @@ public struct S : P {
   public func g(_: Int) {}
   public func f(_: T) {}
 }
+
+// https://github.com/apple/swift/issues/61602
+@available(SwiftStdlib 5.1, *)
+@MainActor protocol ProtocolWithAssociatedTypes {
+    associatedtype ID: Hashable
+    associatedtype Value
+
+    subscript(_ id: ID) -> Value { get set }
+}
+
+@available(SwiftStdlib 5.1, *)
+final class ClassConforming<ID: Hashable,Value>: ProtocolWithAssociatedTypes {
+    subscript(id: ID) -> Value {
+        get { fatalError() }
+        set { fatalError() }
+    }
+}