From 973141a0358f5d47f40acdf272b8d6a9f0cbfba6 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 19 May 2014 22:07:16 +0000 Subject: [PATCH] DebugInfo: Don't include DW_AT_inline on each abstract definition multiple times. When I refactored this in r208636 I accidentally caused this to be added multiple times to each abstract subprogram (not accounting for the deduplicating effect of the InlinedSubprogramDIEs set). This got better in r208798 when the abstract definitions got the attribute added to them at construction time, but still had the redundant copies introduced in r208636. This commit removes those excess DW_AT_inlines and relies solely on the insertion in r208798. llvm-svn: 209166 --- llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 1 - llvm/test/DebugInfo/X86/concrete_out_of_line.ll | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index d26c3d868631..f584c2a036fd 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -468,7 +468,6 @@ DwarfDebug::constructInlinedScopeDIE(DwarfCompileUnit &TheCU, attachRangesOrLowHighPC(TheCU, *ScopeDIE, Scope->getRanges()); InlinedSubprogramDIEs.insert(OriginDIE); - TheCU.addUInt(*OriginDIE, dwarf::DW_AT_inline, None, dwarf::DW_INL_inlined); // Add the call site information to the DIE. DILocation DL(Scope->getInlinedAt()); diff --git a/llvm/test/DebugInfo/X86/concrete_out_of_line.ll b/llvm/test/DebugInfo/X86/concrete_out_of_line.ll index 63607e5a3a71..ae025ad0de33 100644 --- a/llvm/test/DebugInfo/X86/concrete_out_of_line.ll +++ b/llvm/test/DebugInfo/X86/concrete_out_of_line.ll @@ -39,10 +39,13 @@ ; CHECK-NEXT: DW_AT_specification {{.*}} {[[DTOR_DECL]]} ; CHECK-NEXT: DW_AT_{{.*}}linkage_name ; CHECK-NEXT: DW_AT_inline +; CHECK-NOT: DW_AT_inline ; CHECK: [[D2_ABS]]: DW_TAG_subprogram ; CHECK-NEXT: DW_AT_specification {{.*}} {[[DTOR_DECL]]} ; CHECK-NEXT: DW_AT_{{.*}}linkage_name ; CHECK-NEXT: DW_AT_inline +; CHECK-NOT: DW_AT_inline +; CHECK: DW_TAG ; and then that a TAG_subprogram refers to it with AT_abstract_origin.