Merge pull request #29535 from slavapestov/inherited-init-sugar-fix

Sema: Fix module interface printing of inherited generic initializers

Author: slavapestov

lib/Sema/CodeSynthesis.cpp

@@ -411,10 +411,8 @@ configureGenericDesignatedInitOverride(ASTContext &ctx,
       auto *gp = cast<GenericTypeParamType>(type);
       if (gp->getDepth() < superclassDepth)
         return Type(gp).subst(subMap);
-      return CanGenericTypeParamType::get(
-        gp->getDepth() - superclassDepth + depth,
-          gp->getIndex(),
-          ctx);
+      return genericParams->getParams()[gp->getIndex()]
+                 ->getDeclaredInterfaceType();
     };
 
     auto lookupConformanceFn =

test/ModuleInterface/inherited-generic-parameters.swift

@@ -15,13 +15,18 @@
 public class Base<In, Out> {
 // CHECK-NEXT: public init(x: @escaping (In) -> Out)
   public init(x: @escaping (In) -> Out) {}
+
+// CHECK-NEXT: public init<A>(_: A, _: A)
+  public init<A>(_: A, _: A) {}
+
 // CHECK: }
 }
 
 // CHECK: public class Derived<T> : {{(main.)?}}Base<T, T> {
 public class Derived<T> : Base<T, T> {
 // CHECK-NEXT: {{(@objc )?}}deinit
 // CHECK-NEXT: override public init(x: @escaping (T) -> T)
+// CHECK-NEXT: override public init<A>(_ argument: A, _ argument: A)
 // CHECK-NEXT: }
 }