Skip to content

Commit caf3166

Browse files
aganeaaganea
committed
Revert "re-land [DebugInfo] Add debug location to stubs generated by CGDeclCXX and mark them as artificial"
This reverts commit 9c1baa2.
1 parent 50e9956 commit caf3166

File tree

7 files changed

+20
-75
lines changed

7 files changed

+20
-75
lines changed

‎clang/include/clang/AST/GlobalDecl.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ enum class DynamicInitKind : unsigned {
3131
NoStub = 0,
3232
Initializer,
3333
AtExit,
34-
GlobalArrayDestructor
3534
};
3635

3736
/// GlobalDecl - represents a global declaration. This can either be a

‎clang/lib/CodeGen/CGDebugInfo.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,8 +1944,7 @@ StringRef CGDebugInfo::getDynamicInitializerName(const VarDecl *VD,
19441944
llvm::Function *InitFn) {
19451945
// If we're not emitting codeview, use the mangled name. For Itanium, this is
19461946
// arbitrary.
1947-
if (!CGM.getCodeGenOpts().EmitCodeView ||
1948-
StubKind == DynamicInitKind::GlobalArrayDestructor)
1947+
if (!CGM.getCodeGenOpts().EmitCodeView)
19491948
return InitFn->getName();
19501949

19511950
// Print the normal qualified name for the variable, then break off the last
@@ -1970,7 +1969,6 @@ StringRef CGDebugInfo::getDynamicInitializerName(const VarDecl *VD,
19701969

19711970
switch (StubKind) {
19721971
case DynamicInitKind::NoStub:
1973-
case DynamicInitKind::GlobalArrayDestructor:
19741972
llvm_unreachable("not an initializer");
19751973
case DynamicInitKind::Initializer:
19761974
OS << "`dynamic initializer for '";
@@ -3646,8 +3644,7 @@ void CGDebugInfo::EmitFunctionStart(GlobalDecl GD, SourceLocation Loc,
36463644
if (Name.startswith("\01"))
36473645
Name = Name.substr(1);
36483646

3649-
if (!HasDecl || D->isImplicit() || D->hasAttr<ArtificialAttr>() ||
3650-
(isa<VarDecl>(D) && GD.getDynamicInitKind() != DynamicInitKind::NoStub)) {
3647+
if (!HasDecl || D->isImplicit() || D->hasAttr<ArtificialAttr>()) {
36513648
Flags |= llvm::DINode::FlagArtificial;
36523649
// Artificial functions should not silently reuse CurLoc.
36533650
CurLoc = SourceLocation();

‎clang/lib/CodeGen/CGDeclCXX.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ llvm::Function *CodeGenFunction::createAtExitStub(const VarDecl &VD,
244244

245245
CGF.StartFunction(GlobalDecl(&VD, DynamicInitKind::AtExit),
246246
CGM.getContext().VoidTy, fn, FI, FunctionArgList());
247-
// Emit an artificial location for this function.
248-
auto AL = ApplyDebugLocation::CreateArtificial(CGF);
249247

250248
llvm::CallInst *call = CGF.Builder.CreateCall(dtor, addr);
251249

@@ -646,9 +644,8 @@ void CodeGenFunction::GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn,
646644

647645
StartFunction(GlobalDecl(D, DynamicInitKind::Initializer),
648646
getContext().VoidTy, Fn, getTypes().arrangeNullaryFunction(),
649-
FunctionArgList());
650-
// Emit an artificial location for this function.
651-
auto AL = ApplyDebugLocation::CreateArtificial(*this);
647+
FunctionArgList(), D->getLocation(),
648+
D->getInit()->getExprLoc());
652649

653650
// Use guarded initialization if the global variable is weak. This
654651
// occurs for, e.g., instantiated static data members and
@@ -773,10 +770,7 @@ llvm::Function *CodeGenFunction::generateDestroyHelper(
773770

774771
CurEHLocation = VD->getBeginLoc();
775772

776-
StartFunction(GlobalDecl(VD, DynamicInitKind::GlobalArrayDestructor),
777-
getContext().VoidTy, fn, FI, args);
778-
// Emit an artificial location for this function.
779-
auto AL = ApplyDebugLocation::CreateArtificial(*this);
773+
StartFunction(VD, getContext().VoidTy, fn, FI, args);
780774

781775
emitDestroy(addr, type, destroyer, useEHCleanupForArray);
782776

‎clang/test/CodeGenCXX/debug-info-atexit-stub.cpp

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎clang/test/CodeGenCXX/debug-info-destroy-helper.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎clang/test/CodeGenCXX/debug-info-global-ctor-dtor.cpp

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,25 @@ template <typename U>
2929
A FooTpl<T>::sdm_tpl(sizeof(U) + sizeof(T));
3030
template A FooTpl<int>::sdm_tpl<int>;
3131

32-
// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_var_init",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
33-
// CHECK-NOKEXT: !DISubprogram(name: "__dtor_glob",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
34-
// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_var_init.1",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
35-
// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_array_dtor",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
36-
// CHECK-NOKEXT: !DISubprogram(name: "__dtor_array",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
37-
// CHECK-NOKEXT: !DISubprogram(name: "__dtor__ZZ3foovE4stat",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
32+
// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_var_init",{{.*}} line: 15,{{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
33+
// CHECK-NOKEXT: !DISubprogram(name: "__dtor_glob",{{.*}} line: 15,{{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
34+
// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_var_init.1",{{.*}} line: 16,{{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
35+
// CHECK-NOKEXT: !DISubprogram(name: "__cxx_global_array_dtor",{{.*}} line: 16,{{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
36+
// CHECK-NOKEXT: !DISubprogram(name: "__dtor_array",{{.*}} line: 16,{{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
37+
// CHECK-NOKEXT: !DISubprogram(name: "__dtor__ZZ3foovE4stat",{{.*}} line: 19,{{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
3838
// CHECK-NOKEXT: !DISubprogram({{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
3939

4040
// CHECK-KEXT: !DISubprogram({{.*}} DISPFlagLocalToUnit | DISPFlagDefinition
4141

42-
// CHECK-MSVC: !DISubprogram(name: "`dynamic initializer for 'glob'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
43-
// CHECK-MSVC: !DISubprogram(name: "`dynamic atexit destructor for 'glob'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
44-
// CHECK-MSVC: !DISubprogram(name: "`dynamic initializer for 'array'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
45-
// CHECK-MSVC: !DISubprogram(name: "__cxx_global_array_dtor",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
46-
// CHECK-MSVC: !DISubprogram(name: "`dynamic atexit destructor for 'array'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
47-
// CHECK-MSVC: !DISubprogram(name: "`dynamic atexit destructor for 'stat'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
42+
// CHECK-MSVC: !DISubprogram(name: "`dynamic initializer for 'glob'",{{.*}} line: 15,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
43+
// CHECK-MSVC: !DISubprogram(name: "`dynamic atexit destructor for 'glob'",{{.*}} line: 15,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
44+
// CHECK-MSVC: !DISubprogram(name: "`dynamic initializer for 'array'",{{.*}} line: 16,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
45+
// CHECK-MSVC: !DISubprogram(name: "__cxx_global_array_dtor",{{.*}} line: 16,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
46+
// CHECK-MSVC: !DISubprogram(name: "`dynamic atexit destructor for 'array'",{{.*}} line: 16,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
47+
// CHECK-MSVC: !DISubprogram(name: "`dynamic atexit destructor for 'stat'",{{.*}} line: 19,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
4848

4949
// MSVC does weird stuff when templates are involved, so we don't match exactly,
5050
// but these names are reasonable.
5151
// FIXME: These should not be marked DISPFlagLocalToUnit.
52-
// CHECK-MSVC: !DISubprogram(name: "FooTpl<int>::`dynamic initializer for 'sdm_tpl<int>'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
53-
// CHECK-MSVC: !DISubprogram(name: "FooTpl<int>::`dynamic atexit destructor for 'sdm_tpl<int>'",{{.*}} flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition
54-
// CHECK-MSVC: !DISubprogram(linkageName: "_GLOBAL__sub_I_debug_info_global_ctor_dtor.cpp",{{.*}} flags: DIFlagArtificial
52+
// CHECK-MSVC: !DISubprogram(name: "FooTpl<int>::`dynamic initializer for 'sdm_tpl<int>'",{{.*}} line: 29,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition
53+
// CHECK-MSVC: !DISubprogram(name: "FooTpl<int>::`dynamic atexit destructor for 'sdm_tpl<int>'",{{.*}} line: 29,{{.*}}: DISPFlagLocalToUnit | DISPFlagDefinition

‎clang/test/CodeGenCXX/debug-info-line.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void f25() {
314314
// CHECK: [[DBG_F9]] = !DILocation(line: 1000,
315315
// CHECK: [[DBG_F10_STORE]] = !DILocation(line: 1100,
316316
// CHECK: [[DBG_GLBL_CTOR_B]] = !DILocation(line: 1200,
317-
// CHECK: [[DBG_GLBL_DTOR_B]] = !DILocation(line: 0,
317+
// CHECK: [[DBG_GLBL_DTOR_B]] = !DILocation(line: 1200,
318318
// CHECK: [[DBG_F11]] = !DILocation(line: 1300,
319319
// CHECK: [[DBG_F12]] = !DILocation(line: 1400,
320320
// CHECK: [[DBG_F13]] = !DILocation(line: 1500,

0 commit comments

Comments
 (0)