Only emit DWARF types for enums when -gdwarf-types is specified.

Author: adrian-prantl

lib/IRGen/IRGenDebugInfo.cpp

@@ -1624,16 +1624,26 @@ llvm::DIType *IRGenDebugInfo::createType(DebugTypeInfo DbgTy,
     auto *EnumTy = BaseTy->castTo<EnumType>();
     auto *Decl = EnumTy->getDecl();
     auto L = getDebugLoc(SM, Decl);
-    return createEnumType(DbgTy, Decl, MangledName, Scope,
-                          getOrCreateFile(L.Filename), L.Line, Flags);
+    auto *File = getOrCreateFile(L.Filename);
+    if (Opts.DebugInfoKind > IRGenDebugInfoKind::ASTTypes)
+      return createEnumType(DbgTy, Decl, MangledName, Scope, File, L.Line,
+                            Flags);
+    else
+      return createOpaqueStruct(Scope, Decl->getName().str(), File, L.Line,
+                                SizeInBits, AlignInBits, Flags, MangledName);
   }
 
   case TypeKind::BoundGenericEnum: {
     auto *EnumTy = BaseTy->castTo<BoundGenericEnumType>();
     auto *Decl = EnumTy->getDecl();
     auto L = getDebugLoc(SM, Decl);
-    return createEnumType(DbgTy, Decl, MangledName, Scope,
-                          getOrCreateFile(L.Filename), L.Line, Flags);
+    auto *File = getOrCreateFile(L.Filename);
+    if (Opts.DebugInfoKind > IRGenDebugInfoKind::ASTTypes)
+      return createEnumType(DbgTy, Decl, MangledName, Scope, File, L.Line,
+                            Flags);
+    else
+      return createOpaqueStruct(Scope, Decl->getName().str(), File, L.Line,
+                                SizeInBits, AlignInBits, Flags, MangledName);
   }
 
   case TypeKind::BuiltinVector: {

test/DebugInfo/NestedTypes.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -primary-file %s -emit-ir -g -o - | FileCheck %s
+// RUN: %target-swift-frontend -primary-file %s -emit-ir -gdwarf-types -o - | FileCheck %s
 
 // Verify that the size of a class that has not been created before
 // its outer type is emitted is emitted correctly.

test/DebugInfo/bound-namealiastype.swift

@@ -10,6 +10,6 @@ func dispatch_queue_create() -> dispatch_queue_t! {
 
 // CHECK: !DIGlobalVariable(name: "queue",
 // CHECK-SAME:              line: [[@LINE+3]], type: ![[T:[0-9]+]]
-// CHECK: ![[T]] = !DICompositeType(tag: DW_TAG_union_type,
+// CHECK: ![[T]] = !DICompositeType(
 // CHECK-SAME:             identifier: "_TtGSqa4main16dispatch_queue_t_"
 public var queue = dispatch_queue_create()

test/DebugInfo/enum.swift

@@ -7,38 +7,38 @@ protocol P {}
 
 enum Either {
   case First(Int64), Second(P), Neither
-// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "Either",
+// CHECK: !DICompositeType({{.*}}name: "Either",
 // CHECK-SAME:             line: [[@LINE-3]],
 // CHECK-SAME:             size: {{328|168}},
 }
-// CHECK: ![[INT:.*]] = !DICompositeType({{.*}}identifier: "_TtSi"
+// DWARF: ![[INT:.*]] = !DICompositeType({{.*}}identifier: "_TtSi"
 let E : Either = .Neither;
 
-// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "Color",
+// CHECK: !DICompositeType({{.*}}name: "Color",
 // CHECK-SAME:             line: [[@LINE+3]]
 // CHECK-SAME:             size: 8, align: 8,
 // CHECK-SAME:             identifier: "_TtO4enum5Color"
 enum Color : UInt64 {
 // This is effectively a 2-bit bitfield:
-// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "Red"
-// CHECK-SAME:           baseType: ![[UINT64:[0-9]+]]
-// CHECK-SAME:           size: 8, align: 8{{[,)]}}
-// CHECK: ![[UINT64]] = !DICompositeType({{.*}}identifier: "_TtVs6UInt64"
+// DWARF: !DIDerivedType(tag: DW_TAG_member, name: "Red"
+// DWARF-SAME:           baseType: ![[UINT64:[0-9]+]]
+// DWARF-SAME:           size: 8, align: 8{{[,)]}}
+// DWARF: ![[UINT64]] = !DICompositeType({{.*}}identifier: "_TtVs6UInt64"
   case Red, Green, Blue
 }
 
-// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "MaybeIntPair",
+// CHECK: !DICompositeType({{.*}}name: "MaybeIntPair",
 // CHECK-SAME:             line: [[@LINE+3]],
 // CHECK-SAME:             size: 136, align: 64{{[,)]}}
 // CHECK-SAME:             identifier: "_TtO4enum12MaybeIntPair"
 enum MaybeIntPair {
-// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "none"
-// CHECK-SAME:           baseType: ![[INT]], align: 8{{[,)]}}
+// DWARF: !DIDerivedType(tag: DW_TAG_member, name: "none"
+// DWARF-SAME:           baseType: ![[INT]], align: 8{{[,)]}}
   case none
-// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "just"
-// CHECK-SAME:           baseType: ![[INTTUP:[0-9]+]]
-// CHECK-SAME:           size: 128, align: 64{{[,)]}}
-// CHECK: ![[INTTUP]] = !DICompositeType({{.*}}identifier: "_TtTVs5Int64S__"
+// DWARF: !DIDerivedType(tag: DW_TAG_member, name: "just"
+// DWARF-SAME:           baseType: ![[INTTUP:[0-9]+]]
+// DWARF-SAME:           size: 128, align: 64{{[,)]}}
+// DWARF: ![[INTTUP]] = !DICompositeType({{.*}}identifier: "_TtTVs5Int64S__"
   case just(Int64, Int64)
 }
 
@@ -49,7 +49,7 @@ enum Maybe<T> {
 
 let r = Color.Red
 let c = MaybeIntPair.just(74, 75)
-// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "Maybe",
+// CHECK: !DICompositeType({{.*}}name: "Maybe",
 // CHECK-SAME:             line: [[@LINE-8]],
 // CHECK-SAME:             size: 8, align: 8{{[,)]}}
 // CHECK-SAME:             identifier: "_TtGO4enum5MaybeOS_5Color_"

test/DebugInfo/generic_enum.swift

@@ -18,7 +18,7 @@ func wrapTrivialGeneric<T, U>(_ t: T, u: U) -> TrivialGeneric<T, U> {
 }
 // CHECK-DAG: ![[T1:.*]] = !DICompositeType({{.*}}identifier: "_TtGO12generic_enum14TrivialGenericVs5Int64SS_"
 // CHECK-DAG: !DIGlobalVariable(name: "tg",{{.*}} line: [[@LINE+2]],{{.*}} type: ![[T1]],{{.*}} isLocal: false, isDefinition: true
-// CHECK-DAG: !DICompositeType(tag: DW_TAG_union_type, name: "TrivialGeneric", {{.*}}identifier: "_TtGO12generic_enum14TrivialGenericVs5Int64SS_"
+// CHECK-DAG: !DICompositeType({{.*}}, name: "TrivialGeneric", {{.*}}identifier: "_TtGO12generic_enum14TrivialGenericVs5Int64SS_"
 var tg : TrivialGeneric<Int64, String> = .x(23, "skidoo")
 switch tg {
 case .x(var t, var u):

test/DebugInfo/variables.swift

@@ -102,7 +102,7 @@ enum TriValue {
   case top
 }
 // CHECK-DAG: !DIGlobalVariable(name: "unknown",{{.*}} type: ![[TRIVAL:[0-9]+]]
-// CHECK-DAG: ![[TRIVAL]] = !DICompositeType(tag: DW_TAG_union_type, name: "TriValue",
+// CHECK-DAG: ![[TRIVAL]] = !DICompositeType({{.*}}name: "TriValue",
 var unknown = TriValue.top
 func myprint(_ value: TriValue) {
      switch value {