Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[CGDebugInfo] Emit subprograms for decls when AT_tail_call is… #304

Merged
merged 1 commit into from
Nov 14, 2019
Merged

Revert "[CGDebugInfo] Emit subprograms for decls when AT_tail_call is… #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions clang/lib/CodeGen/CGDebugInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3773,7 +3773,9 @@ void CGDebugInfo::EmitFunctionDecl(GlobalDecl GD, SourceLocation Loc,
void CGDebugInfo::EmitFuncDeclForCallSite(llvm::CallBase *CallOrInvoke,
QualType CalleeType,
const FunctionDecl *CalleeDecl) {
if (!CallOrInvoke || getCallSiteRelatedAttrs() == llvm::DINode::FlagZero)
auto &CGOpts = CGM.getCodeGenOpts();
if (!CGOpts.EnableDebugEntryValues || !CGM.getLangOpts().Optimize ||
!CallOrInvoke)
return;

auto *Func = CallOrInvoke->getCalledFunction();
Expand Down Expand Up @@ -4847,10 +4849,10 @@ llvm::DINode::DIFlags CGDebugInfo::getCallSiteRelatedAttrs() const {
bool SupportsDWARFv4Ext =
CGM.getCodeGenOpts().DwarfVersion == 4 &&
(CGM.getCodeGenOpts().getDebuggerTuning() == llvm::DebuggerKind::LLDB ||
CGM.getCodeGenOpts().getDebuggerTuning() == llvm::DebuggerKind::GDB);
(CGM.getCodeGenOpts().EnableDebugEntryValues &&
CGM.getCodeGenOpts().getDebuggerTuning() == llvm::DebuggerKind::GDB));

if (!SupportsDWARFv4Ext && CGM.getCodeGenOpts().DwarfVersion < 5 &&
!CGM.getCodeGenOpts().EnableDebugEntryValues)
if (!SupportsDWARFv4Ext && CGM.getCodeGenOpts().DwarfVersion < 5)
return llvm::DINode::FlagZero;

return llvm::DINode::FlagAllCallsDescribed;
Expand Down
21 changes: 4 additions & 17 deletions clang/test/CodeGen/debug-info-extern-call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
// When entry values are emitted, expect a subprogram for extern decls so that
// the dwarf generator can describe call site parameters at extern call sites.
//
// RUN: %clang -Xclang -femit-debug-entry-values -g -O2 -target x86_64-none-linux-gnu -S -emit-llvm %s -o - | FileCheck %s -check-prefix=ENTRY-VAL
// ENTRY-VAL: !DISubprogram(name: "fn1"
// RUN: %clang -Xclang -femit-debug-entry-values -g -O2 -target x86_64-none-linux-gnu -S -emit-llvm %s -o - | FileCheck %s -check-prefix=CHECK-EXT
// CHECK-EXT: !DISubprogram(name: "fn1"

// Similarly, when the debugger tuning is gdb, expect a subprogram for extern
// decls so that the dwarf generator can describe information needed for tail
// call frame reconstrution.
//
// RUN: %clang -g -O2 -target x86_64-none-linux-gnu -ggdb -S -emit-llvm %s -o - | FileCheck %s -check-prefix=GDB
// GDB: !DISubprogram(name: "fn1"
//
// Do not emit a subprogram for extern decls when entry values are disabled and
// the tuning is not set to gdb.
//
// RUN: %clang -g -O2 -target x86_64-none-linux-gnu -gsce -S -emit-llvm %s -o - | FileCheck %s -check-prefix=SCE
// SCE-NOT: !DISubprogram(name: "fn1"
// RUN: %clang -g -O2 -target x86_64-none-linux-gnu -S -emit-llvm %s -o - | FileCheck %s
// CHECK-NOT: !DISubprogram(name: "fn1"

extern int fn1(int a, int b);

Expand Down
1 change: 0 additions & 1 deletion clang/test/CodeGenCXX/dbg-info-all-calls-described.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

// NO-ATTR-NOT: FlagAllCallsDescribed

// HAS-ATTR-DAG: DISubprogram(name: "declaration1", {{.*}}, flags: DIFlagPrototyped
// HAS-ATTR-DAG: DISubprogram(name: "declaration2", {{.*}}, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition
// HAS-ATTR-DAG: DISubprogram(name: "struct1", {{.*}}, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized)
// HAS-ATTR-DAG: DISubprogram(name: "struct1", {{.*}}, flags: DIFlagPrototyped | DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition
Expand Down
9 changes: 0 additions & 9 deletions llvm/test/DebugInfo/X86/dwarf-callsite-related-attrs.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@

@sink = global i32 0, align 4, !dbg !0

define void @__has_no_subprogram() {
entry:
%0 = load volatile i32, i32* @sink, align 4
%inc = add nsw i32 %0, 1
store volatile i32 %inc, i32* @sink, align 4
ret void
}

; ASM: DW_TAG_subprogram
; ASM: DW_AT_call_all_calls
; OBJ: [[bat_sp:.*]]: DW_TAG_subprogram
Expand Down Expand Up @@ -78,7 +70,6 @@ entry:
; OBJ: DW_AT_call_tail_call
define void @_Z3foov() !dbg !25 {
entry:
tail call void @__has_no_subprogram()
tail call void @_Z3barv(), !dbg !26
tail call void @_Z3batv(), !dbg !27
tail call void @_Z3barv(), !dbg !26
Expand Down