Skip to content

Commit 839b17c

Browse files
kikairoyakikairoya
committed
revert the temporary hack
1 parent 9490d58 commit 839b17c

File tree

4 files changed

+23
-47
lines changed

4 files changed

+23
-47
lines changed

‎clang/lib/CodeGen/CGDebugInfo.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2657,8 +2657,7 @@ StringRef CGDebugInfo::getVTableName(const CXXRecordDecl *RD) {
26572657
// existing information in the DWARF. The type is assumed to be 'void *'.
26582658
void CGDebugInfo::emitVTableSymbol(llvm::GlobalVariable *VTable,
26592659
const CXXRecordDecl *RD) {
2660-
if (!CGM.getTarget().getCXXABI().isItaniumFamily() ||
2661-
CGM.getTarget().getTriple().isOSBinFormatCOFF())
2660+
if (!CGM.getTarget().getCXXABI().isItaniumFamily())
26622661
return;
26632662
if (DebugKind <= llvm::codegenoptions::DebugLineTablesOnly)
26642663
return;

‎clang/test/DebugInfo/CXX/class.cpp‎

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ int main(int argc, char **argv) {
9999
return 0;
100100
}
101101

102-
// RUN: %clang_cc1 -triple x86_64-unknown_unknown -emit-llvm -debug-info-kind=limited -fexceptions -std=c++98 %s -o - | FileCheck -check-prefix=CHECK98 -check-prefix=CHECK -check-prefix=CHECKELF %s
103-
// RUN: %clang_cc1 -triple i686-cygwin -emit-llvm -debug-info-kind=limited -fexceptions -std=c++98 %s -o - | FileCheck -check-prefix=CHECK98 -check-prefix=CHECK -check-prefix=CHECKCOFF %s
104-
// RUN: %clang_cc1 -triple armv7l-unknown-linux-gnueabihf -emit-llvm -debug-info-kind=limited -fexceptions -std=c++98 %s -o - | FileCheck -check-prefix=CHECK98 -check-prefix=CHECK -check-prefix=CHECKELF %s
105-
// RUN: %clang_cc1 -triple x86_64-unknown_unknown -emit-llvm -debug-info-kind=limited -fexceptions -std=c++11 %s -o - | FileCheck -check-prefix=CHECK11 -check-prefix=CHECK -check-prefix=CHECKELF %s
106-
// RUN: %clang_cc1 -triple i686-cygwin -emit-llvm -debug-info-kind=limited -fexceptions -std=c++11 %s -o - | FileCheck -check-prefix=CHECK11 -check-prefix=CHECK -check-prefix=CHECKCOFF %s
107-
// RUN: %clang_cc1 -triple armv7l-unknown-linux-gnueabihf -emit-llvm -debug-info-kind=limited -fexceptions -std=c++11 %s -o - | FileCheck -check-prefix=CHECK11 -check-prefix=CHECK -check-prefix=CHECKELF %s
102+
// RUN: %clang_cc1 -triple x86_64-unknown_unknown -emit-llvm -debug-info-kind=limited -fexceptions -std=c++98 %s -o - | FileCheck -check-prefix=CHECK98 -check-prefix=CHECK %s
103+
// RUN: %clang_cc1 -triple i686-cygwin -emit-llvm -debug-info-kind=limited -fexceptions -std=c++98 %s -o - | FileCheck -check-prefix=CHECK98 -check-prefix=CHECK %s
104+
// RUN: %clang_cc1 -triple armv7l-unknown-linux-gnueabihf -emit-llvm -debug-info-kind=limited -fexceptions -std=c++98 %s -o - | FileCheck -check-prefix=CHECK98 -check-prefix=CHECK %s
105+
// RUN: %clang_cc1 -triple x86_64-unknown_unknown -emit-llvm -debug-info-kind=limited -fexceptions -std=c++11 %s -o - | FileCheck -check-prefix=CHECK11 -check-prefix=CHECK %s
106+
// RUN: %clang_cc1 -triple i686-cygwin -emit-llvm -debug-info-kind=limited -fexceptions -std=c++11 %s -o - | FileCheck -check-prefix=CHECK11 -check-prefix=CHECK %s
107+
// RUN: %clang_cc1 -triple armv7l-unknown-linux-gnueabihf -emit-llvm -debug-info-kind=limited -fexceptions -std=c++11 %s -o - | FileCheck -check-prefix=CHECK11 -check-prefix=CHECK %s
108108

109109
// CHECK98: invoke {{.+}} @_ZN1BD1Ev(ptr {{[^,]*}} %b)
110110
// CHECK98-NEXT: unwind label %{{.+}}, !dbg ![[EXCEPTLOC:.*]]
@@ -122,14 +122,6 @@ int main(int argc, char **argv) {
122122
// CHECK-SAME: ){{$}}
123123

124124
// CHECK: ![[INT:[0-9]+]] = !DIBasicType(name: "int"
125-
// CHECKCOFF: !DICompositeType(tag: DW_TAG_structure_type, name: "foo"
126-
// CHECKCOFF: !DICompositeType(tag: DW_TAG_class_type, name: "bar"
127-
// CHECKCOFF: !DICompositeType(tag: DW_TAG_union_type, name: "baz"
128-
// CHECKCOFF: !DICompositeType(tag: DW_TAG_class_type, name: "B"
129-
// CHECKCOFF-NOT: DIFlagFwdDecl
130-
// CHECKCOFF-SAME: ){{$}}
131-
// CHECKCOFF: !DIDerivedType(tag: DW_TAG_member, name: "_vptr$B",
132-
// CHECKCOFF-SAME: DIFlagArtificial
133125

134126
// CHECK: [[C:![0-9]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "C",
135127
// CHECK-NOT: DIFlagFwdDecl
@@ -145,19 +137,19 @@ int main(int argc, char **argv) {
145137
// CHECK-SAME: DIFlagStaticMember
146138
// CHECK: [[C_DTOR]] = !DISubprogram(name: "~C"
147139

148-
// CHECKELF: !DICompositeType(tag: DW_TAG_structure_type, name: "K"
149-
// CHECKELF-SAME: identifier: "_ZTS1K"
150-
// CHECKELF-SAME: ){{$}}
140+
// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "K"
141+
// CHECK-SAME: identifier: "_ZTS1K"
142+
// CHECK-SAME: ){{$}}
151143

152-
// CHECKELF: !DICompositeType(tag: DW_TAG_class_type, name: "B"
153-
// CHECKELF-NOT: DIFlagFwdDecl
154-
// CHECKELF-SAME: ){{$}}
155-
// CHECKELF: !DIDerivedType(tag: DW_TAG_member, name: "_vptr$B",
156-
// CHECKELF-SAME: DIFlagArtificial
144+
// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "B"
145+
// CHECK-NOT: DIFlagFwdDecl
146+
// CHECK-SAME: ){{$}}
147+
// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "_vptr$B",
148+
// CHECK-SAME: DIFlagArtificial
157149

158-
// CHECKELF: !DICompositeType(tag: DW_TAG_structure_type, name: "foo"
159-
// CHECKELF: !DICompositeType(tag: DW_TAG_class_type, name: "bar"
160-
// CHECKELF: !DICompositeType(tag: DW_TAG_union_type, name: "baz"
150+
// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo"
151+
// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "bar"
152+
// CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "baz"
161153

162154
// CHECK: [[D:![0-9]+]] = !DICompositeType(tag: DW_TAG_structure_type, name: "D"
163155
// CHECK-SAME: size:
@@ -170,10 +162,6 @@ int main(int argc, char **argv) {
170162
// CHECK-NOT: identifier:
171163
// CHECK-SAME: ){{$}}
172164

173-
// CHECKCOFF: !DICompositeType(tag: DW_TAG_structure_type, name: "K"
174-
// CHECKCOFF-SAME: identifier: "_ZTS1K"
175-
// CHECKCOFF-SAME: ){{$}}
176-
177165
// CHECK: [[L:![0-9]+]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "L"
178166
// CHECK-SAME: ){{$}}
179167
// CHECK: [[L_FUNC_DECL:![0-9]*]] = !DISubprogram(name: "func",{{.*}} scope: [[L]]

‎clang/test/DebugInfo/CXX/vtable-inheritance-simple.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ int main() {
3737

3838
// CHECK: @_ZTVN3NSP5CBaseE = linkonce_odr {{.*}}unnamed_addr constant {{.*}}, comdat, align 8, !dbg [[BASE_VTABLE_VAR:![0-9]*]]
3939
// CHECK: @_ZTV8CDerived = linkonce_odr {{.*}}unnamed_addr constant {{.*}}, comdat, align 8, !dbg [[DERIVED_VTABLE_VAR:![0-9]*]]
40-
// COFF: @_ZTVN3NSP5CBaseE = linkonce_odr {{.*}}unnamed_addr constant {{.*}}, comdat, align 8
41-
// COFF-NOT: !dbg
42-
// COFF-SAME: {{$}}
43-
// COFF: @_ZTV8CDerived = linkonce_odr {{.*}}unnamed_addr constant {{.*}}, comdat, align 8
44-
// COFF-NOT: !dbg
45-
// COFF-SAME: {{$}}
4640

4741
// CHECK: [[BASE_VTABLE_VAR]] = !DIGlobalVariableExpression(var: [[BASE_VTABLE:![0-9]*]], expr: !DIExpression())
4842
// CHECK-NEXT: [[BASE_VTABLE]] = distinct !DIGlobalVariable(name: "_vtable$", linkageName: "_ZTVN3NSP5CBaseE"

‎clang/test/Modules/ExtDebugInfo.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// RUN: -fmodule-format=obj -fimplicit-module-maps -DMODULES \
99
// RUN: -triple %itanium_abi_triple \
1010
// RUN: -fmodules-cache-path=%t %s -I %S/Inputs -I %t -emit-llvm -o %t-mod.ll
11-
// RUN: cat %t-mod.ll | FileCheck %s --check-prefix=CHECK %if target={{.*-(win|mingw|cyg).*}} %{--check-prefix=CHECKCOFF%} %else %{--check-prefix=CHECKELF%}
11+
// RUN: cat %t-mod.ll | FileCheck %s
1212

1313
// PCH:
1414
// RUN: %clang_cc1 -x c++ -std=c++11 -fmodule-format=obj -emit-pch -I%S/Inputs \
@@ -18,7 +18,7 @@
1818
// RUN: -dwarf-ext-refs -fmodule-format=obj \
1919
// RUN: -triple %itanium_abi_triple \
2020
// RUN: -include-pch %t.pch %s -emit-llvm -o %t-pch.ll
21-
// RUN: cat %t-pch.ll | FileCheck %s --check-prefix=CHECK %if target={{.*-(win|mingw|cyg).*}} %{--check-prefix=CHECKCOFF%} %else %{--check-prefix=CHECKELF%}
21+
// RUN: cat %t-pch.ll | FileCheck %s
2222
// RUN: cat %t-pch.ll | FileCheck %s --check-prefix=CHECK-PCH
2323

2424
#ifdef MODULES
@@ -208,9 +208,9 @@ void foo() {
208208
// CHECK-SAME: name: "InAnonymousNamespace", {{.*}}DIFlagFwdDecl)
209209

210210
// There is a full definition of the type available in the module.
211-
// CHECKELF: !DICompositeType(tag: DW_TAG_structure_type, name: "Virtual",
212-
// CHECKELF-SAME: DIFlagFwdDecl
213-
// CHECKELF-SAME: identifier: "_ZTS7Virtual")
211+
// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Virtual",
212+
// CHECK-SAME: DIFlagFwdDecl
213+
// CHECK-SAME: identifier: "_ZTS7Virtual")
214214

215215
// CHECK: !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !{{[0-9]+}}, entity: ![[STRUCT]], file: ![[CPP]], line: 50)
216216

@@ -222,8 +222,3 @@ void foo() {
222222

223223
// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "A",
224224
// CHECK-SAME: DIFlagFwdDecl
225-
226-
// There is a full definition of the type available in the module.
227-
// CHECKCOFF: !DICompositeType(tag: DW_TAG_structure_type, name: "Virtual",
228-
// CHECKCOFF-SAME: DIFlagFwdDecl
229-
// CHECKCOFF-SAME: identifier: "_ZTS7Virtual")

0 commit comments

Comments
 (0)