[PATCH] D54350: [DWARFv5] Emit split type units in .debug_info.dwo
Paul Robinson via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 9 13:21:54 PST 2018
probinson created this revision.
probinson added reviewers: dblaikie, aprantl, clayborg.
probinson added a project: debug-info.
Herald added subscribers: JDevlieghere, hiraditya.
I laugh and say "nothing's that simple."
Ideas for test cases that would get split CUs and TUs to step on each others toes?
I really thought having them in the same section would be a problem.
Repository:
rL LLVM
https://reviews.llvm.org/D54350
Files:
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
llvm/test/CodeGen/X86/dwarf-headers.ll
llvm/test/CodeGen/X86/dwarf-split-line-1.ll
llvm/test/CodeGen/X86/dwarf-split-line-2.ll
Index: llvm/test/CodeGen/X86/dwarf-split-line-2.ll
===================================================================
--- llvm/test/CodeGen/X86/dwarf-split-line-2.ll
+++ llvm/test/CodeGen/X86/dwarf-split-line-2.ll
@@ -8,8 +8,7 @@
; RUN: llvm-dwarfdump -v %t.dwo | FileCheck %s
; Currently the no-source-location type comes out first.
-; FIXME: V5 wants type units in .debug_info.dwo not .debug_types.dwo.
-; CHECK: .debug_types.dwo contents:
+; CHECK: .debug_info.dwo contents:
; CHECK: 0x00000000: Type Unit: {{.*}} name = 'S'
; CHECK-SAME: (next unit at [[TU2:0x[0-9a-f]+]])
; CHECK: DW_TAG_type_unit
Index: llvm/test/CodeGen/X86/dwarf-split-line-1.ll
===================================================================
--- llvm/test/CodeGen/X86/dwarf-split-line-1.ll
+++ llvm/test/CodeGen/X86/dwarf-split-line-1.ll
@@ -6,13 +6,13 @@
; RUN: -filetype=obj -O0 -mtriple=x86_64-unknown-linux-gnu < %s
; RUN: llvm-dwarfdump -v %t.dwo | FileCheck %s
-; FIXME: V5 wants type units in .debug_info.dwo not .debug_types.dwo.
; CHECK-NOT: .debug_line.dwo
-; CHECK: .debug_types.dwo contents:
+; CHECK: .debug_info.dwo contents:
; CHECK: 0x00000000: Type Unit: {{.*}} version = 0x0005 unit_type = DW_UT_split_type abbr_offset
; CHECK: 0x00000018: DW_TAG_type_unit
; CHECK-NOT: DW_AT_stmt_list
; CHECK-NOT: DW_AT_decl_file
+; CHECK: Compile Unit:
; CHECK-NOT: .debug_line.dwo
; ModuleID = 't.cpp'
Index: llvm/test/CodeGen/X86/dwarf-headers.ll
===================================================================
--- llvm/test/CodeGen/X86/dwarf-headers.ll
+++ llvm/test/CodeGen/X86/dwarf-headers.ll
@@ -78,14 +78,11 @@
; O-5: 0x00000014: DW_TAG_compile_unit
;
; DWO-5: .debug_info.dwo contents:
-; DWO-5: 0x00000000: Compile Unit: {{.*}} version = 0x0005 unit_type = DW_UT_split_compile abbr_offset
-; DWO-5-SAME: DWO_id = 0xccd7e58ef8bf4aa6
-; DWO-5: 0x00000014: DW_TAG_compile_unit
-;
-; FIXME: V5 wants type units in .debug_info.dwo not .debug_types.dwo.
-; DWO-5: .debug_types.dwo contents:
; DWO-5: 0x00000000: Type Unit: {{.*}} version = 0x0005 unit_type = DW_UT_split_type abbr_offset
; DWO-5: 0x00000018: DW_TAG_type_unit
+; DWO-5: 0x00000033: Compile Unit: {{.*}} version = 0x0005 unit_type = DW_UT_split_compile abbr_offset
+; DWO-5-SAME: DWO_id = 0xccd7e58ef8bf4aa6
+; DWO-5: 0x00000047: DW_TAG_compile_unit
; ModuleID = 't.cpp'
Index: llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2609,10 +2609,13 @@
NewTU.setTypeSignature(Signature);
Ins.first->second = Signature;
- if (useSplitDwarf())
- // FIXME: v5 split type units belong in .debug_info.dwo.
- NewTU.setSection(Asm->getObjFileLowering().getDwarfTypesDWOSection());
- else {
+ if (useSplitDwarf()) {
+ MCSection *Section =
+ getDwarfVersion() <= 4
+ ? Asm->getObjFileLowering().getDwarfTypesDWOSection()
+ : Asm->getObjFileLowering().getDwarfInfoDWOSection();
+ NewTU.setSection(Section);
+ } else {
MCSection *Section =
getDwarfVersion() <= 4
? Asm->getObjFileLowering().getDwarfTypesSection(Signature)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54350.173430.patch
Type: text/x-patch
Size: 3252 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181109/71894878/attachment.bin>
More information about the llvm-commits
mailing list