diff options
| author | David Blaikie <dblaikie@gmail.com> | 2014-05-19 22:07:16 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2014-05-19 22:07:16 +0000 |
| commit | 973141a0358f5d47f40acdf272b8d6a9f0cbfba6 (patch) | |
| tree | 2371d9557a2df1a65e70927bfc1730bacf545e19 | |
| parent | 48b056bab048a84d1cad5186721b1e9d94d7a2c0 (diff) | |
| download | bcm5719-llvm-973141a0358f5d47f40acdf272b8d6a9f0cbfba6.tar.gz bcm5719-llvm-973141a0358f5d47f40acdf272b8d6a9f0cbfba6.zip | |
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
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/X86/concrete_out_of_line.ll | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index d26c3d86863..f584c2a036f 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 63607e5a3a7..ae025ad0de3 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. |
