Merge pull request #31836 from slavapestov/gsb-superclass-nested-type-5.3

GSB: Concretize nested types when adding a superclass constraint [5.3]

Author: slavapestov

lib/AST/GenericSignatureBuilder.cpp

@@ -2522,7 +2522,13 @@ static void concretizeNestedTypeFromConcreteParent(
     GenericSignatureBuilder &builder) {
   auto parentEquiv = parent->getEquivalenceClassIfPresent();
   assert(parentEquiv && "can't have a concrete type without an equiv class");
+
+  bool isSuperclassConstrained = false;
   auto concreteParent = parentEquiv->concreteType;
+  if (!concreteParent) {
+    isSuperclassConstrained = true;
+    concreteParent = parentEquiv->superclass;
+  }
   assert(concreteParent &&
          "attempting to resolve concrete nested type of non-concrete PA");
 
@@ -2544,8 +2550,14 @@ static void concretizeNestedTypeFromConcreteParent(
          "No conformance requirement");
   const RequirementSource *parentConcreteSource = nullptr;
   for (const auto &constraint : parentEquiv->conformsTo.find(proto)->second) {
-    if (constraint.source->kind == RequirementSource::Concrete) {
-      parentConcreteSource = constraint.source;
+    if (!isSuperclassConstrained) {
+      if (constraint.source->kind == RequirementSource::Concrete) {
+        parentConcreteSource = constraint.source;
+      }
+    } else {
+      if (constraint.source->kind == RequirementSource::Superclass) {
+        parentConcreteSource = constraint.source;
+      }
     }
   }
 
@@ -4264,6 +4276,15 @@ bool GenericSignatureBuilder::updateSuperclass(
     for (const auto &conforms : equivClass->conformsTo) {
       (void)resolveSuperConformance(type, conforms.first);
     }
+
+    // Eagerly resolve any existing nested types to their concrete forms (others
+    // will be "concretized" as they are constructed, in getNestedType).
+    for (auto equivT : equivClass->members) {
+      for (auto nested : equivT->getNestedTypes()) {
+        concretizeNestedTypeFromConcreteParent(equivT, nested.second.front(),
+                                               *this);
+      }
+    }
   };
 
   // If we haven't yet recorded a superclass constraint for this equivalence
@@ -7156,6 +7177,12 @@ void GenericSignatureBuilder::dump(llvm::raw_ostream &out) {
     pa->dump(out, &Context.SourceMgr, 2);
   }
   out << "\n";
+
+  out << "Equivalence classes:\n";
+  for (auto &equiv : Impl->EquivalenceClasses) {
+    equiv.dump(out, this);
+  }
+  out << "\n";
 }
 
 void GenericSignatureBuilder::addGenericSignature(GenericSignature sig) {

test/Generics/superclass_constraint_nested_type.swift

@@ -0,0 +1,23 @@
+// RUN: %target-typecheck-verify-swift
+
+// rdar://problem/39481178 - Introducing a superclass constraint does not add
+// same-type constraints on nested types
+
+protocol P {
+  associatedtype Q
+}
+
+class C : P {
+  typealias Q = Int
+}
+
+// Use the "generic parameter cannot be concrete" check as a proxy for the
+// same-type constraint 'T == C.Q (aka Int)' having been inferred:
+
+extension P {
+  func f1<T>(_: T) where T == Q, Self : C {}
+  // expected-error@-1 {{same-type requirement makes generic parameter 'T' non-generic}}
+
+  func f2<T>(_: T) where Self : C, T == Q {}
+  // expected-error@-1 {{same-type requirement makes generic parameter 'T' non-generic}}
+}

validation-test/compiler_crashers_2/sr11232.swift renamed to validation-test/compiler_crashers_2_fixed/sr11232.swift

@@ -1,6 +1,4 @@
-// RUN: not --crash %target-swift-emit-silgen %s
-
-// REQUIRES: asserts
+// RUN: not %target-swift-emit-silgen %s
 
 protocol Pub {
   associatedtype Other