SILGen: Substitute initializer's interface type into thunk's context …

…in emitForeignToNativeThunk. rdar://problem/32331915
Ajisaputrars · May 22, 2017 · 85e4456 · 85e4456
1 parent ae6ce20
commit 85e4456
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/lib/SILGen/SILGenBridging.cpp b/lib/SILGen/SILGenBridging.cpp
@@ -1241,6 +1241,9 @@ void SILGenFunction::emitForeignToNativeThunk(SILDeclRef thunk) {
     allocatorSelfType = forwardedParameters[0]
       ->getInterfaceType(getASTContext())
       ->getLValueOrInOutObjectType();
+    if (F.getGenericEnvironment())
+      allocatorSelfType = F.getGenericEnvironment()
+        ->mapTypeIntoContext(allocatorSelfType);
     forwardedParameters = forwardedParameters.slice(1);
   }
 

diff --git a/test/SILGen/Inputs/objc_required_designated_init.h b/test/SILGen/Inputs/objc_required_designated_init.h
@@ -0,0 +1,5 @@
+@import Foundation;
+
+@interface NSBoom<T> : NSObject
+
+@end
diff --git a/test/SILGen/Inputs/objc_required_designated_init_2.swift b/test/SILGen/Inputs/objc_required_designated_init_2.swift
@@ -6,3 +6,9 @@ open class Boom: NSObject {
   }
 }
 
+open class Badaboom<U>: NSBoom<NSString> {
+  public override required init() {
+    super.init()
+  }
+}
+
diff --git a/test/SILGen/objc_required_designated_init.swift b/test/SILGen/objc_required_designated_init.swift
@@ -1,6 +1,7 @@
 // RUN: rm -rf %t && mkdir -p %t
-// RUN: %target-swift-frontend -emit-module %S/Inputs/objc_required_designated_init_2.swift -module-name Booms -o %t/Booms.swiftmodule
-// RUN: %target-swift-frontend -I %t -emit-silgen -verify %s
+// RUN: %target-swift-frontend -emit-module %S/Inputs/objc_required_designated_init_2.swift -module-name Booms -o %t/Booms.swiftmodule -import-objc-header %S/Inputs/objc_required_designated_init.h
+// RUN: %target-swift-frontend -I %t -emit-silgen -verify %s -import-objc-header %S/Inputs/objc_required_designated_init.h
+
 // REQUIRES: objc_interop
 
 import Booms
@@ -11,3 +12,8 @@ class Baboom: Boom {
   }
 }
 
+class BigBadaBoom<V>: Badaboom<V> {
+  required init() {
+    super.init()
+  }
+}