Merge pull request #35404 from slavapestov/archetype-nested-type-is-fully-concrete-5.4

GSB: Handle concrete ResolvedTypes in ArchetypeType::resolveNestedType() [5.4]

Author: slavapestov

lib/AST/GenericSignatureBuilder.cpp

@@ -2633,16 +2633,24 @@ void ArchetypeType::resolveNestedType(
   Type interfaceType = getInterfaceType();
   Type memberInterfaceType =
     DependentMemberType::get(interfaceType, nested.first);
-  auto equivClass =
-    builder.resolveEquivalenceClass(
+  auto resolved =
+    builder.maybeResolveEquivalenceClass(
                                   memberInterfaceType,
-                                  ArchetypeResolutionKind::CompleteWellFormed);
-  if (!equivClass) {
+                                  ArchetypeResolutionKind::CompleteWellFormed,
+                                  /*wantExactPotentialArchetype=*/false);
+  if (!resolved) {
     nested.second = ErrorType::get(interfaceType);
     return;
   }
 
-  auto result = equivClass->getTypeInContext(builder, genericEnv);
+  Type result;
+  if (auto concrete = resolved.getAsConcreteType()) {
+    result = concrete;
+  } else {
+    auto *equivClass = resolved.getEquivalenceClass(builder);
+    result = equivClass->getTypeInContext(builder, genericEnv);
+  }
+
   assert(!nested.second ||
          nested.second->isEqual(result) ||
          (nested.second->hasError() && result->hasError()));

validation-test/compiler_crashers_2_fixed/sr13519.swift

@@ -0,0 +1,19 @@
+// RUN: %target-swift-frontend -typecheck %s
+
+// https://bugs.swift.org/browse/SR-13519
+
+class Class: P {
+  typealias A = Bool
+}
+
+protocol P {
+  associatedtype A
+}
+
+protocol Q : P {
+  func takesA(arg: A)
+}
+
+func test<T: Class & Q>(arg: T) {
+  arg.takesA(arg: true)
+}