From b887aacccd6345757f9190272911d65ffd6d54d2 Mon Sep 17 00:00:00 2001 From: Momchil Velikov Date: Wed, 7 Feb 2018 19:57:04 +0000 Subject: [PATCH] Revert [DebugInfo] Improvements to representation of enumeration types (PR36168)" Revert due to breaking buildbots (LLDB tests) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@324508 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGDebugInfo.cpp | 12 ++- test/CodeGen/debug-info-enum.cpp | 100 ---------------------- test/CodeGenCXX/debug-info-enum-class.cpp | 6 +- test/CodeGenCXX/debug-info-enum.cpp | 2 +- test/Modules/ModuleDebugInfo.cpp | 2 +- 5 files changed, 10 insertions(+), 112 deletions(-) delete mode 100644 test/CodeGen/debug-info-enum.cpp diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 9d12130376..e766ccc203 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -2492,12 +2492,9 @@ llvm::DIType *CGDebugInfo::CreateTypeDefinition(const EnumType *Ty) { // Create elements for each enumerator. SmallVector Enumerators; ED = ED->getDefinition(); - bool IsSigned = ED->getIntegerType()->isSignedIntegerType(); for (const auto *Enum : ED->enumerators()) { - const auto &InitVal = Enum->getInitVal(); - auto Value = IsSigned ? InitVal.getSExtValue() : InitVal.getZExtValue(); - Enumerators.push_back( - DBuilder.createEnumerator(Enum->getName(), Value, !IsSigned)); + Enumerators.push_back(DBuilder.createEnumerator( + Enum->getName(), Enum->getInitVal().getSExtValue())); } // Return a CompositeType for the enum itself. @@ -2506,10 +2503,11 @@ llvm::DIType *CGDebugInfo::CreateTypeDefinition(const EnumType *Ty) { llvm::DIFile *DefUnit = getOrCreateFile(ED->getLocation()); unsigned Line = getLineNumber(ED->getLocation()); llvm::DIScope *EnumContext = getDeclContextDescriptor(ED); - llvm::DIType *ClassTy = getOrCreateType(ED->getIntegerType(), DefUnit); + llvm::DIType *ClassTy = + ED->isFixed() ? getOrCreateType(ED->getIntegerType(), DefUnit) : nullptr; return DBuilder.createEnumerationType(EnumContext, ED->getName(), DefUnit, Line, Size, Align, EltArray, ClassTy, - FullName, ED->isFixed()); + FullName); } llvm::DIMacro *CGDebugInfo::CreateMacro(llvm::DIMacroFile *Parent, diff --git a/test/CodeGen/debug-info-enum.cpp b/test/CodeGen/debug-info-enum.cpp deleted file mode 100644 index 1237f28b9a..0000000000 --- a/test/CodeGen/debug-info-enum.cpp +++ /dev/null @@ -1,100 +0,0 @@ -// Test enumeration representation in debuig info metadata: -// * test value representation for each possible underlying integer type -// * test the integer type is as expected -// * test the DW_AT_enum_class attribute is present (resp. absent) as expected. - -// RUN: %clang -target x86_64-linux -g -S -emit-llvm -o - %s | FileCheck %s - - -enum class E0 : signed char { - A0 = -128, - B0 = 127, -} x0; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E0" -// CHECK-SAME: baseType: ![[SCHAR:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS0:[0-9]+]] -// CHECK: ![[SCHAR]] = !DIBasicType(name: "signed char", size: 8, encoding: DW_ATE_signed_char) -// CHECK: ![[ELTS0]] = !{![[A0:[0-9]+]], ![[B0:[0-9]+]]} -// CHECK: ![[A0]] = !DIEnumerator(name: "A0", value: -128) -// CHECK: ![[B0]] = !DIEnumerator(name: "B0", value: 127) - -enum class E1 : unsigned char { A1 = 255 } x1; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E1" -// CHECK-SAME: baseType: ![[UCHAR:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS1:[0-9]+]] -// CHECK: ![[UCHAR]] = !DIBasicType(name: "unsigned char", size: 8, encoding: DW_ATE_unsigned_char) -// CHECK: ![[ELTS1]] = !{![[A1:[0-9]+]]} -// CHECK: ![[A1]] = !DIEnumerator(name: "A1", value: 255, isUnsigned: true) - -enum class E2 : signed short { - A2 = -32768, - B2 = 32767, -} x2; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E2" -// CHECK-SAME: baseType: ![[SHORT:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS2:[0-9]+]] -// CHECK: ![[SHORT]] = !DIBasicType(name: "short", size: 16, encoding: DW_ATE_signed) -// CHECK: ![[ELTS2]] = !{![[A2:[0-9]+]], ![[B2:[0-9]+]]} -// CHECK: ![[A2]] = !DIEnumerator(name: "A2", value: -32768) -// CHECK: ![[B2]] = !DIEnumerator(name: "B2", value: 32767) - -enum class E3 : unsigned short { A3 = 65535 } x3; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E3" -// CHECK-SAME: baseType: ![[USHORT:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS3:[0-9]+]] -// CHECK: ![[USHORT]] = !DIBasicType(name: "unsigned short", size: 16, encoding: DW_ATE_unsigned) -// CHECK: ![[ELTS3]] = !{![[A3:[0-9]+]]} -// CHECK: ![[A3]] = !DIEnumerator(name: "A3", value: 65535, isUnsigned: true) - -enum class E4 : signed int { A4 = -2147483648, B4 = 2147483647 } x4; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E4" -// CHECK-SAME: baseType: ![[INT:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS4:[0-9]+]] -// CHECK: ![[INT]] = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) -// CHECK: ![[ELTS4]] = !{![[A4:[0-9]+]], ![[B4:[0-9]+]]} -// CHECK: ![[A4]] = !DIEnumerator(name: "A4", value: -2147483648) -// CHECK: ![[B4]] = !DIEnumerator(name: "B4", value: 2147483647) - -enum class E5 : unsigned int { A5 = 4294967295 } x5; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E5" -// CHECK-SAME: baseType: ![[UINT:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS5:[0-9]+]] -// CHECK: ![[UINT]] = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned) -// CHECK: ![[ELTS5]] = !{![[A5:[0-9]+]]} -// CHECK: ![[A5]] = !DIEnumerator(name: "A5", value: 4294967295, isUnsigned: true) - -enum class E6 : signed long long { - A6 = -9223372036854775807LL - 1, - B6 = 9223372036854775807LL -} x6; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E6" -// CHECK-SAME: baseType: ![[LONG:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS6:[0-9]+]] -// CHECK: ![[LONG]] = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed) -// CHECK: ![[ELTS6]] = !{![[A6:[0-9]+]], ![[B6:[0-9]+]]} -// CHECK: ![[A6]] = !DIEnumerator(name: "A6", value: -9223372036854775808) -// CHECK: ![[B6]] = !DIEnumerator(name: "B6", value: 9223372036854775807) - -enum class E7 : unsigned long long { A7 = 18446744073709551615ULL } x7; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E7" -// CHECK-SAME: baseType: ![[ULONG:[0-9]+]] -// CHECK-SAME: DIFlagFixedEnum -// CHECK-SAME: elements: ![[ELTS7:[0-9]+]] -// CHECK: ![[ULONG]] = !DIBasicType(name: "long long unsigned int", size: 64, encoding: DW_ATE_unsigned) -// CHECK: ![[ELTS7]] = !{![[A7:[0-9]+]]} -// CHECK: ![[A7]] = !DIEnumerator(name: "A7", value: 18446744073709551615, isUnsigned: true) - -// Also test the FixedEnum flag is not present for old-style enumerations. -enum E8 { A8 = -128, B8 = 127 } x8; -// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "E8" -// CHECK-SAME: baseType: ![[INT]] -// CHECK-NOT: DIFlagFixedEnum -// CHECK: !DIEnumerator(name: "A8", value: -128) - diff --git a/test/CodeGenCXX/debug-info-enum-class.cpp b/test/CodeGenCXX/debug-info-enum-class.cpp index e857bb1959..b615d5b096 100644 --- a/test/CodeGenCXX/debug-info-enum-class.cpp +++ b/test/CodeGenCXX/debug-info-enum-class.cpp @@ -15,7 +15,7 @@ D d; // CHECK-SAME: baseType: ![[INT:[0-9]+]] // CHECK-SAME: size: 32 // CHECK-NOT: offset: -// CHECK-SAME: flags: DIFlagFixedEnum +// CHECK-NOT: flags: // CHECK-SAME: ){{$}} // CHECK: ![[INT]] = !DIBasicType(name: "int" // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "B" @@ -23,12 +23,12 @@ D d; // CHECK-SAME: baseType: ![[ULONG:[0-9]+]] // CHECK-SAME: size: 64 // CHECK-NOT: offset: -// CHECK-SAME: flags: DIFlagFixedEnum +// CHECK-NOT: flags: // CHECK-SAME: ){{$}} // CHECK: ![[ULONG]] = !DIBasicType(name: "long unsigned int" // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, name: "C" // CHECK-SAME: line: 5 -// CHECK-SAME: baseType: ![[ULONG:[0-9]+]] +// CHECK-NOT: baseType: // CHECK-SAME: size: 32 // CHECK-NOT: offset: // CHECK-NOT: flags: diff --git a/test/CodeGenCXX/debug-info-enum.cpp b/test/CodeGenCXX/debug-info-enum.cpp index 447edba446..8f54f9d712 100644 --- a/test/CodeGenCXX/debug-info-enum.cpp +++ b/test/CodeGenCXX/debug-info-enum.cpp @@ -11,7 +11,7 @@ namespace test1 { // CHECK-SAME: identifier: "_ZTSN5test11eE" // CHECK: [[TEST1]] = !DINamespace(name: "test1" // CHECK: [[TEST1_ENUMS]] = !{[[TEST1_E:![0-9]*]]} -// CHECK: [[TEST1_E]] = !DIEnumerator(name: "E", value: 0, isUnsigned: true) +// CHECK: [[TEST1_E]] = !DIEnumerator(name: "E", value: 0) enum e { E }; void foo() { int v = E; diff --git a/test/Modules/ModuleDebugInfo.cpp b/test/Modules/ModuleDebugInfo.cpp index 116aa5fc31..f0d8837670 100644 --- a/test/Modules/ModuleDebugInfo.cpp +++ b/test/Modules/ModuleDebugInfo.cpp @@ -48,7 +48,7 @@ // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, // CHECK-NOT: name: // CHECK-SAME: ) -// CHECK: !DIEnumerator(name: "e5", value: 5, isUnsigned: true) +// CHECK: !DIEnumerator(name: "e5", value: 5) // CHECK: !DIDerivedType(tag: DW_TAG_typedef, name: "B", // no mangled name here yet. -- 2.40.0