Merge pull request #2055 from jckarter/lazy-interface-type

Author: swift-ci

lib/AST/Type.cpp

@@ -1942,8 +1942,7 @@ static ForeignRepresentableKind getObjCObjectRepresentable(Type type) {
     type = dynSelf->getSelfType();
 
   // @objc classes.
-  if (auto classType = type->getAs<ClassType>()) {
-    auto classDecl = classType->getDecl();
+  if (auto classDecl = type->getClassOrBoundGenericClass()) {
     auto &ctx = classDecl->getASTContext();
     if (auto resolver = ctx.getLazyResolver())
       resolver->resolveDeclSignature(classDecl);

lib/Sema/CodeSynthesis.cpp

@@ -1581,10 +1581,12 @@ void TypeChecker::completeLazyVarImplementation(VarDecl *VD) {
   NameBuf += ".storage";
   auto StorageName = Context.getIdentifier(NameBuf);
   auto StorageTy = OptionalType::get(VD->getType());
+  auto StorageInterfaceTy = OptionalType::get(VD->getInterfaceType());
 
   auto *Storage = new (Context) VarDecl(/*isStatic*/false, /*isLet*/false,
                                         VD->getLoc(), StorageName, StorageTy,
                                         VD->getDeclContext());
+  Storage->setInterfaceType(StorageInterfaceTy);
   Storage->setUserAccessible(false);
   addMemberToContextIfNeeded(Storage, VD->getDeclContext(), VD);
 

test/ClangModules/objc_bridging_generics.swift

@@ -76,6 +76,9 @@ func testImportedTypeParamRequirements() {
 
 extension GenericClass {
   func doesntUseGenericParam() {}
+  @objc func doesntUseGenericParam2() -> Self {}
+  // Doesn't technically use 'T', since it's type-erased at runtime
+  func doesntUseGenericParam3() -> GenericClass<T> {}
 
   // expected-error@+1{{Extension of a generic Objective-C class cannot access the class's generic parameters}}
   func usesGenericParamA(_ x: T) {}
@@ -97,6 +100,9 @@ extension GenericClass {
   }
 
   static func doesntUseGenericParam() {}
+  static func doesntUseGenericParam2() -> Self {}
+  // Doesn't technically use 'T', since it's type-erased at runtime
+  static func doesntUseGenericParam3() -> GenericClass<T> {}
 
   // expected-error@+1{{Extension of a generic Objective-C class cannot access the class's generic parameters}}
   static func usesGenericParamA(_ x: T) {}
@@ -116,4 +122,10 @@ extension GenericClass {
   static func usesGenericParamF(_ x: Int) {
     _ = x is T
   }
+
+  func checkThatMethodsAreObjC() {
+    _ = #selector(GenericClass.doesntUseGenericParam)
+    _ = #selector(GenericClass.doesntUseGenericParam2)
+    _ = #selector(GenericClass.doesntUseGenericParam3)
+  }
 }

test/decl/var/Inputs/lazy_properties_multi_file_2.swift

@@ -0,0 +1,4 @@
+struct MyGenericStruct<T> {
+    lazy var prop2 = [AnotherGenericStruct<T>]()
+}
+struct AnotherGenericStruct<T> { }

test/decl/var/lazy_properties_multi_file.swift

@@ -0,0 +1,7 @@
+// RUN: rm -rf %t
+// RUN: mkdir -p %t
+// RUN: %target-swift-frontend %s -verify -O -primary-file %s %S/Inputs/lazy_properties_multi_file_2.swift -c -o %t/lazy_properties_multi_file.o
+
+class MyClass {
+    var myProperty = MyGenericStruct<Int>()
+}