Merge pull request #68508 from tshortli/conformance-lookup-circularity

AST: Revert inherited type request in ConformanceLookupTable

Author: tshortli

lib/AST/ConformanceLookupTable.cpp

@@ -228,8 +228,7 @@ void ConformanceLookupTable::inheritConformances(ClassDecl *classDecl,
 
     auto inheritedTypes = classDecl->getInherited();
     for (unsigned i : inheritedTypes.getIndices()) {
-      if (auto inheritedType = inheritedTypes.getResolvedType(i)) {
-
+      if (auto inheritedType = inheritedTypes.getEntry(i).getType()) {
         if (inheritedType->getClassOrBoundGenericClass()) {
           superclassLoc = inheritedTypes.getEntry(i).getSourceRange().Start;
           return superclassLoc;

test/Generics/rdar115314044.swift

@@ -0,0 +1,16 @@
+// RUN: %target-typecheck-verify-swift
+
+public protocol P {}
+
+public protocol Q {
+  associatedtype A: P
+  func f(_: A)
+}
+
+open class Parent<C: P>: Q {
+  public func f(_: C) {}
+}
+
+final class Child: Parent<Child.Nested> {
+  struct Nested: P {}
+}