---

yaml
---
r: 347983
b: refs/heads/master
c: ef0b2a4
h: refs/heads/master
i:
  347981: 5ac017b
  347979: 0e669bb
  347975: f5e34da
  347967: 4f2c13d

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 07353a13b2aa08b354a3308720b1bf210d402067
+refs/heads/master: ef0b2a45d0d6c35e392740b1da5385a7b1194e3e
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/CodeSynthesis.cpp

@@ -2722,6 +2722,7 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
     auto paramTy = decl->getInterfaceType();
     auto substTy = paramTy.subst(subMap, SubstFlags::UseErrorType);
     decl->setInterfaceType(substTy);
+    decl->getTypeLoc() = TypeLoc::withoutLoc(substTy);
   }
 
   // Create the initializer declaration, inheriting the name,

trunk/test/ParseableInterface/default-args.swift

@@ -28,7 +28,7 @@ public class Derived: Base {
   }
 
   // CHECK-NOT: init(convInit: Int = super)
-  // CHECK: override {{(public )?}}init(x: Int = super)
+  // CHECK: override {{(public )?}}init(x: {{(Swift.)?}}Int = super)
   // CHECK-NOT: init(convInit: Int = super)
 }
 

trunk/test/ParseableInterface/inherited-generic-parameters.swift

@@ -0,0 +1,27 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-frontend -typecheck %s -emit-module-interface-path %t/main.swiftinterface -enable-library-evolution
+// RUN: %FileCheck %s < %t/main.swiftinterface
+
+// RUN: %target-build-swift %s -emit-module-interface-path %t/main.swiftinterface -enable-library-evolution
+// RUN: %FileCheck %s < %t/main.swiftinterface
+
+// RUN: %target-build-swift %s -emit-module-interface-path %t/main.swiftinterface -enable-library-evolution -wmo
+// RUN: %FileCheck %s < %t/main.swiftinterface
+
+// This test makes sure that we substitute uses of the superclass's generic
+// parameters when we inherit initializers.
+
+// CHECK: public class Base<In, Out> {
+public class Base<In, Out> {
+// CHECK-NEXT: public init(x: @escaping (In) -> Out)
+  public init(x: @escaping (In) -> Out) {}
+// CHECK: }
+}
+
+// CHECK: public class Derived<T> : {{(main.)?}}Base<T, T> {
+public class Derived<T> : Base<T, T> {
+// CHECK-NEXT: override public init(x: @escaping (T) -> T)
+// CHECK: }
+}
+

trunk/test/ParseableInterface/modifiers.swift

@@ -69,7 +69,7 @@ public class Base {
 // CHECK-LABEL: public class SubImplicit : {{(Test[.])?Base}} {
 public class SubImplicit: Base {
   // CHECK-NEXT: @objc override public init(){{$}}
-  // CHECK-NEXT: @objc required public init(x: [[INT]]){{$}}
+  // CHECK-NEXT: @objc required public init(x: Swift.Int){{$}}
   // CHECK-NEXT: @objc deinit{{$}}
 } // CHECK-NEXT: {{^}$}}