Merge pull request #60143 from slavapestov/rqm-request-cycle-rdar97236936-5.7

RequirementMachine: Fix a request cycle [5.7]

Author: slavapestov

lib/AST/RequirementMachine/RequirementLowering.cpp

@@ -987,7 +987,12 @@ TypeAliasRequirementsRequest::evaluate(Evaluator &evaluator,
         // to the associated type would have to be conditional, which we cannot
         // model.
         if (auto ext = dyn_cast<ExtensionDecl>(type->getDeclContext())) {
-          if (ext->isConstrainedExtension()) continue;
+          // FIXME: isConstrainedExtension() can cause request cycles because it
+          // computes a generic signature. getTrailingWhereClause() should be good
+          // enough for protocol extensions, which cannot specify constraints in
+          // any other way right now (eg, via requirement inference or by
+          // extending a bound generic type).
+          if (ext->getTrailingWhereClause()) continue;
         }
 
         // We found something.

test/Generics/protocol_typealias_cycle_6.swift

@@ -0,0 +1,12 @@
+// RUN: %target-typecheck-verify-swift
+
+protocol P {
+  associatedtype A
+  associatedtype B
+}
+
+protocol Q: P {}
+
+extension Q where A == Int {
+  typealias B = Int
+}