Reflection: Record builtin and imported types referenced from captures

Author: slavapestov

lib/IRGen/GenReflection.cpp

@@ -819,7 +819,6 @@ IRGenModule::getAddrOfBoxDescriptor(CanType BoxedType) {
   if (!IRGen.Opts.EnableReflectionMetadata)
     return llvm::Constant::getNullValue(CaptureDescriptorPtrTy);
 
-  llvm::SetVector<CanType> BuiltinTypes;
   BoxDescriptorBuilder builder(*this, BuiltinTypes, BoxedType);
 
   auto var = builder.emit();
@@ -838,7 +837,6 @@ IRGenModule::getAddrOfCaptureDescriptor(SILFunction &Caller,
   if (!IRGen.Opts.EnableReflectionMetadata)
     return llvm::Constant::getNullValue(CaptureDescriptorPtrTy);
 
-  llvm::SetVector<CanType> BuiltinTypes;
   CaptureDescriptorBuilder builder(*this, BuiltinTypes, Caller,
                                    OrigCalleeType, SubstCalleeType, Subs,
                                    Layout);

test/Reflection/Inputs/ObjectiveCTypes.swift

@@ -28,3 +28,6 @@ public class HasObjCClasses {
   let integer = NSInteger()
 }
 
+public func closureHasObjCClasses(b: NSBundle) -> () -> () {
+  return { _ = b }
+}

test/Reflection/typeref_decoding_objc.swift

@@ -17,6 +17,8 @@
 // CHECK-32: integer: Swift.Int
 // CHECK-32: (struct Swift.Int)
 
+// CHECK-32: __ObjC.NSBundle
+// CHECK-32: ---------------
 // CHECK-32: __ObjC.NSURL
 // CHECK-32: ------------
 
@@ -26,6 +28,12 @@
 // CHECK-32: BUILTIN TYPES:
 // CHECK-32: ==============
 
+// CHECK-32: - __ObjC.NSBundle:
+// CHECK-32: Size: 4
+// CHECK-32: Alignment: 4
+// CHECK-32: Stride: 4
+// CHECK-32: NumExtraInhabitants: 4096
+
 // CHECK-32: - __ObjC.NSURL:
 // CHECK-32: Size: 4
 // CHECK-32: Alignment: 4
@@ -88,6 +96,9 @@
 // CHECK-64: integer: Swift.Int
 // CHECK-64: (struct Swift.Int)
 
+// CHECK-64: __ObjC.NSBundle
+// CHECK-64: ------------
+
 // CHECK-64: __ObjC.NSURL
 // CHECK-64: ------------
 
@@ -97,6 +108,12 @@
 // CHECK-64: BUILTIN TYPES:
 // CHECK-64: ==============
 
+// CHECK-64: - __ObjC.NSBundle:
+// CHECK-64: Size: 8
+// CHECK-64: Alignment: 8
+// CHECK-64: Stride: 8
+// CHECK-64: NumExtraInhabitants: 2147483647
+
 // CHECK-64: - __ObjC.NSURL:
 // CHECK-64: Size: 8
 // CHECK-64: Alignment: 8

validation-test/Reflection/functions_objc.swift

@@ -6,7 +6,7 @@
 import SwiftReflectionTest
 import Foundation
 
-func capturesImportedClass(x: Int, n: NSURLX, r: NSRect) {
+func capturesImportedClass(x: Int, n: NSURL, r: NSRect) {
   reflect(function: {print(x); print(n); print(r)})
 
 // CHECK-32:      Type reference: