IRGen: Only emit capture descriptors if -enable-reflection-metadata frontend flag is passed in

Also, simplify the IRGen/reflection_metadata.swift test a bit; there's no
reason to split it up into two files.

Author: slavapestov

lib/IRGen/GenFunc.cpp

@@ -1289,7 +1289,7 @@ void irgen::emitFunctionPartialApplication(IRGenFunction &IGF,
                     /*typeToFill*/ nullptr,
                     std::move(bindings));
 
-  auto Descriptor = IGF.IGM.getAddrOfCaptureDescriptor(SILFn, layout);
+  auto descriptor = IGF.IGM.getAddrOfCaptureDescriptor(SILFn, layout);
 
   llvm::Value *data;
   if (layout.isKnownEmpty()) {
@@ -1298,9 +1298,8 @@ void irgen::emitFunctionPartialApplication(IRGenFunction &IGF,
     // Allocate a new object.
     HeapNonFixedOffsets offsets(IGF, layout);
 
-    data = IGF.emitUnmanagedAlloc(layout, "closure", Descriptor, &offsets);
+    data = IGF.emitUnmanagedAlloc(layout, "closure", descriptor, &offsets);
     Address dataAddr = layout.emitCastTo(IGF, data);
-
 
     unsigned i = 0;
 

lib/IRGen/GenReflection.cpp

@@ -771,6 +771,9 @@ llvm::Constant *IRGenModule::getAddrOfStringForTypeRef(StringRef Str) {
 
 llvm::Constant *IRGenModule::getAddrOfCaptureDescriptor(SILFunction &SILFn,
                                                         HeapLayout &Layout) {
+  if (!IRGen.Opts.EnableReflectionMetadata)
+    return llvm::Constant::getNullValue(CaptureDescriptorPtrTy);
+
   llvm::SetVector<CanType> BuiltinTypes;
   CaptureDescriptorBuilder builder(*this, BuiltinTypes, SILFn, Layout);
 
@@ -782,9 +785,6 @@ llvm::Constant *IRGenModule::getAddrOfCaptureDescriptor(SILFunction &SILFn,
 }
 
 void IRGenModule::emitReflectionMetadata(const NominalTypeDecl *Decl) {
-  if (!IRGen.Opts.EnableReflectionMetadata)
-    return;
-
   llvm::SetVector<CanType> BuiltinTypes;
 
   emitFieldMetadataRecord(Decl);

test/IRGen/Inputs/reflection_metadata.swift

@@ -4,7 +4,7 @@
 
 // -- partial_apply context metadata
 
-// CHECK: [[METADATA:@.*]] = private constant %swift.full_boxmetadata { void (%swift.refcounted*)* @objectdestroy.2, i8** null, %swift.type { i64 64 }, i32 16, i8* bitcast (<{ i32, i32, i32, i32, i32, i32 }>* @"\01l__swift3_capture_descriptor.1" to i8*) }
+// CHECK: [[METADATA:@.*]] = private constant %swift.full_boxmetadata { void (%swift.refcounted*)* @objectdestroy.1, i8** null, %swift.type { i64 64 }, i32 16, i8* null }
 
 func a(i i: Int) -> (Int) -> Int {
   return { x in i }

test/IRGen/closure.swift

@@ -1,13 +1,25 @@
-// RUN: %target-swift-frontend -enable-reflection-metadata -enable-reflection-names -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s
-// RUN: %target-swift-frontend -enable-reflection-metadata -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
-// RUN: %target-swift-frontend -emit-ir %S/Inputs/reflection_metadata.swift | FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA
+// RUN: %target-swift-frontend -enable-reflection-metadata -enable-reflection-names -emit-ir %s | FileCheck %s
+// RUN: %target-swift-frontend -enable-reflection-metadata -emit-ir %s | FileCheck %s --check-prefix=STRIP_REFLECTION_NAMES
+// RUN: %target-swift-frontend -emit-ir %s | FileCheck %s --check-prefix=STRIP_REFLECTION_METADATA
 
-// STRIP_REFLECTION_NAMES-NOT: {{.*}}swift3_reflstr
 // STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_reflect
+// STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_fieldmd
+// STRIP_REFLECTION_NAMES_DAG: {{.*}}swift3_assocty
+// STRIP_REFLECTION_NAMES-DAG: {{.*}}swift3_capture
+// STRIP_REFLECTION_NAMES-DAG: {{.*}}swift3_typeref
+// STRIP_REFLECTION_NAMES-NOT: {{.*}}swift3_reflstr
+// STRIP_REFLECTION_NAMES-NOT: {{.*}}swift3_builtin
+
 // STRIP_REFLECTION_NAMES-DAG: @"\01l__swift3_reflection_metadata"
 
-// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_reflstr
 // STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_reflect
+// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_fieldmd
+// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_assocty
+// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_capture
+// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_typeref
+// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_reflstr
+// STRIP_REFLECTION_METADATA-NOT: {{.*}}swift3_builtin
+
 // STRIP_REFLECTION_METADATA-NOT: @"\01l__swift3_reflection_metadata"
 
 // CHECK-DAG: private constant [2 x i8] c"i\00", section "{{[^"]*}}swift3_reflstr{{[^"]*}}"
@@ -27,3 +39,69 @@
 // CHECK-DAG: private constant [3 x i8] c"GE\00", section "{{[^"]*}}swift3_reflstr{{[^"]*}}"
 
 // CHECK: @"\01l__swift3_reflection_metadata{{.*}}" = private constant <{ {{.*}} }>
+
+public protocol MyProtocol {
+  associatedtype Inner
+  var inner: Inner { get }
+}
+
+public class MyClass {
+  let i: Int
+  let ms: MyStruct
+  let me: MyEnum
+  public init(i: Int, ms: MyStruct, me: MyEnum) {
+    self.i = i
+    self.ms = ms
+    self.me = me
+  }
+}
+
+public struct Conformance : MyProtocol {
+  public var inner: Int = 0
+}
+
+public struct MyStruct {
+  let i: Int
+  let mc: MyClass
+  let me: MyEnum
+}
+
+public enum MyEnum {
+  case C(MyClass)
+  indirect case S(MyStruct)
+  indirect case E(MyEnum)
+  case I(Int)
+}
+
+public class MyGenericClass<T : MyProtocol> {
+  let t: T
+  let i: T.Inner
+  let mgs: MyGenericStruct<T>
+  let mge: MyGenericEnum<T>
+
+  public init(t: T, i: T.Inner, mgs: MyGenericStruct<T>, mge: MyGenericEnum<T>) {
+    self.t = t
+    self.i = i
+    self.mgs = mgs
+    self.mge = mge
+  }
+}
+
+public struct MyGenericStruct<T : MyProtocol> {
+  let t: T
+  let i: T.Inner
+  let mgc: MyGenericClass<T>
+  let mge: MyGenericEnum<T>
+}
+
+public enum MyGenericEnum<T : MyProtocol> {
+  case GC(MyGenericClass<T>)
+  indirect case GS(MyGenericStruct<T>)
+  indirect case GE(MyGenericEnum<T>)
+  case I(Int)
+}
+
+public func makeSomeClosures<T, U>(t: T, x: Int, y: MyGenericStruct<U>)
+    -> (() -> (), () -> (), () -> ()) {
+  return ({ _ = t }, { _ = x }, { _ = y })
+}