Merge pull request #4251 from jckarter/pseudogeneric-crashers-3.0

[3.0] rdar://problem/26867815 Prevent crashes when accessing ObjC generic members

Author: tkremenek

lib/IRGen/GenMeta.cpp

@@ -267,8 +267,8 @@ static bool isTypeErasedGenericClassType(CanType type) {
 }
 
 // Get the type that exists at runtime to represent a compile-time type.
-static CanType
-getRuntimeReifiedType(IRGenModule &IGM, CanType type) {
+CanType
+irgen::getRuntimeReifiedType(IRGenModule &IGM, CanType type) {
   return CanType(type.transform([&](Type t) -> Type {
     if (isTypeErasedGenericClassType(CanType(t))) {
       return t->getAnyNominal()->getDeclaredType()->getCanonicalType();

lib/IRGen/GenMeta.h

@@ -85,6 +85,10 @@ namespace irgen {
                                                    CanType type,
                                                    SymbolReferenceKind refKind);
 
+  /// Get the type as it exists in Swift's runtime type system, removing any
+  /// erased generic parameters.
+  CanType getRuntimeReifiedType(IRGenModule &IGM, CanType type);
+
   /// Emit a reference to a compile-time constant piece of heap metadata, or
   /// return a null pointer if the type's heap metadata cannot be represented
   /// by a constant.

lib/IRGen/IRGenSIL.cpp

@@ -747,8 +747,10 @@ class IRGenSILFunction :
     // Force all archetypes referenced by the type to be bound by this point.
     // TODO: just make sure that we have a path to them that the debug info
     //       can follow.
-    if (!IGM.IRGen.Opts.Optimize && Ty.getType()->hasArchetype())
-      Ty.getType()->getCanonicalType().visit([&](Type t) {
+    auto runtimeTy = getRuntimeReifiedType(IGM,
+                                           Ty.getType()->getCanonicalType());
+    if (!IGM.IRGen.Opts.Optimize && runtimeTy->hasArchetype())
+      runtimeTy.visit([&](Type t) {
         if (auto archetype = dyn_cast<ArchetypeType>(CanType(t)))
           emitTypeMetadataRef(archetype);
        });

lib/Sema/TypeCheckCaptures.cpp

@@ -199,6 +199,13 @@ class FindCapturedVars : public ASTWalker {
   std::pair<bool, Expr *> walkToDeclRefExpr(DeclRefExpr *DRE) {
     auto *D = DRE->getDecl();
 
+    // Capture the generic parameters of the decl.
+    if (!AFR.isObjC() || !D->isObjC() || isa<ConstructorDecl>(D)) {
+      for (auto sub : DRE->getDeclRef().getSubstitutions()) {
+        checkType(sub.getReplacement(), DRE->getLoc());
+      }
+    }
+
     // DC is the DeclContext where D was defined
     // CurDC is the DeclContext where D was referenced
     auto DC = D->getDeclContext();
@@ -430,17 +437,22 @@ class FindCapturedVars : public ASTWalker {
               && !E->getType()->is<AnyMetatypeType>());
 
     // Accessing @objc members doesn't require type metadata.
+    // rdar://problem/27796375 -- allocating init entry points for ObjC
+    // initializers are generated as true Swift generics, so reify type
+    // parameters.
     if (auto memberRef = dyn_cast<MemberRefExpr>(E))
       return !memberRef->getMember().getDecl()->hasClangNode();
 
     if (auto applyExpr = dyn_cast<ApplyExpr>(E)) {
       if (auto methodApply = dyn_cast<ApplyExpr>(applyExpr->getFn())) {
         if (auto callee = dyn_cast<DeclRefExpr>(methodApply->getFn())) {
-          return !callee->getDecl()->isObjC();
+          return !callee->getDecl()->isObjC()
+            || isa<ConstructorDecl>(callee->getDecl());
         }
       }
       if (auto callee = dyn_cast<DeclRefExpr>(applyExpr->getFn())) {
-        return !callee->getDecl()->isObjC();
+        return !callee->getDecl()->isObjC()
+          || isa<ConstructorDecl>(callee->getDecl());
       }
     }
 

test/ClangModules/objc_bridging_generics.swift

@@ -265,6 +265,14 @@ extension AnimalContainer {
     T.apexPredator = x // expected-note{{used here}}
   }
 
+  // rdar://problem/27796375 -- allocating init entry points for ObjC
+  // initializers are generated as true Swift generics, so reify type
+  // parameters.
+  // expected-error@+1{{extension of a generic Objective-C class cannot access the class's generic parameters}}
+  func usesGenericParamE(_ x: T) {
+    _ = GenericClass(thing: x) // expected-note{{used here}}
+  }
+
   func checkThatMethodsAreObjC() {
     _ = #selector(AnimalContainer.doesntUseGenericParam1)
     _ = #selector(AnimalContainer.doesntUseGenericParam2)
@@ -283,9 +291,11 @@ extension AnimalContainer {
 
 extension PettableContainer {
   func doesntUseGenericParam(_ x: T, _ y: T.Type) {
-    _ = type(of: x).init(fur: x).other()
+    // TODO: rdar://problem/27796375--allocating entry points are emitted as
+    // true generics.
+    // _ = type(of: x).init(fur: x).other()
     _ = type(of: x).adopt().other()
-    _ = y.init(fur: x).other()
+    // _ = y.init(fur: x).other()
     _ = y.adopt().other()
     x.pet()
     x.pet(with: x)

test/IRGen/objc_generic_class_debug_info.swift

@@ -0,0 +1,13 @@
+
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %s -emit-ir -g -verify
+
+// REQUIRES: objc_interop
+
+import Swift
+import Foundation
+import objc_generics
+
+extension GenericClass {
+  func method() {}
+  class func classMethod() {}
+}