This is an archive of the discontinued LLVM Phabricator instance.

Differential D61241

[DWARF] Fix dump of local/foreign TU lists in .debug_names
ClosedPublic

Authored by MaskRay on Apr 28 2019, 8:07 AM.

Details

Reviewers
aprantl
dblaikie
echristo
labath
Commits
rG97b8cd54adec: [DWARF] Fix dump of local/foreign TU lists in .debug_names
rL359425: [DWARF] Fix dump of local/foreign TU lists in .debug_names

Diff Detail

Repository
rL LLVM

Event Timeline

MaskRay created this revision.Apr 28 2019, 8:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 28 2019, 8:07 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B31072: Diff 197030.Apr 28 2019, 8:07 AM
MaskRay updated this revision to Diff 197031.Apr 28 2019, 8:10 AM

Fix a comment in the test

Harbormaster completed remote builds in B31073: Diff 197031.Apr 28 2019, 8:11 AM
MaskRay marked 2 inline comments as done.Apr 28 2019, 8:14 AM
MaskRay added inline comments.
test/tools/llvm-dwarfdump/X86/debug-names-many-tu.s
75 ↗(On Diff #197031)

Question: should I add an end-of-mark (.byte 0) here?

88 ↗(On Diff #197031)

Question: is the end-of-mark (.byte 0) necessary?

labath accepted this revision.Apr 29 2019, 1:31 AM

Looks good to me. Thanks for fixing this.

test/tools/llvm-dwarfdump/X86/debug-names-many-tu.s
75 ↗(On Diff #197031)

I believe it is not necessary, as your abbreviation for the compile unit DIE says DW_CHILDREN_no. The same goes for the other question.

This revision is now accepted and ready to land.Apr 29 2019, 1:31 AM
MaskRay updated this revision to Diff 197064.Apr 29 2019, 1:41 AM

Delete redundant end-of-mark .byte 0

Harbormaster completed remote builds in B31083: Diff 197064.Apr 29 2019, 1:41 AM
MaskRay updated this revision to Diff 197066.Apr 29 2019, 1:51 AM

.long 0 // DW_IDE_die_offset

>

.long .Ltu_die0-.Lcu_begin0 // DW_IDX_die_offset

to make the example more plausible

Harbormaster completed remote builds in B31084: Diff 197066.Apr 29 2019, 1:52 AM
Closed by commit rL359425: [DWARF] Fix dump of local/foreign TU lists in .debug_names (authored by MaskRay). · Explain WhyApr 29 2019, 1:53 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
DebugInfo/
DWARF/
5 lines
test/
tools/
llvm-dwarfdump/
X86/
107 lines

Diff 197067

llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp

Show First 20 Lines • Show All 579 Lines • ▼ Show 20 Lines
uint32_t DWARFDebugNames::NameIndex::getCUOffset(uint32_t CU) const { uint32_t DWARFDebugNames::NameIndex::getCUOffset(uint32_t CU) const {
assert(CU < Hdr.CompUnitCount); assert(CU < Hdr.CompUnitCount);
uint32_t Offset = CUsBase + 4 * CU; uint32_t Offset = CUsBase + 4 * CU;
return Section.AccelSection.getRelocatedValue(4, &Offset); return Section.AccelSection.getRelocatedValue(4, &Offset);
} }
uint32_t DWARFDebugNames::NameIndex::getLocalTUOffset(uint32_t TU) const { uint32_t DWARFDebugNames::NameIndex::getLocalTUOffset(uint32_t TU) const {
assert(TU < Hdr.LocalTypeUnitCount); assert(TU < Hdr.LocalTypeUnitCount);
uint32_t Offset = CUsBase + Hdr.CompUnitCount * 4; uint32_t Offset = CUsBase + 4 * (Hdr.CompUnitCount + TU);
return Section.AccelSection.getRelocatedValue(4, &Offset); return Section.AccelSection.getRelocatedValue(4, &Offset);
} }
uint64_t DWARFDebugNames::NameIndex::getForeignTUSignature(uint32_t TU) const { uint64_t DWARFDebugNames::NameIndex::getForeignTUSignature(uint32_t TU) const {
assert(TU < Hdr.ForeignTypeUnitCount); assert(TU < Hdr.ForeignTypeUnitCount);
uint32_t Offset = CUsBase + (Hdr.CompUnitCount + Hdr.LocalTypeUnitCount) * 4; uint32_t Offset =
CUsBase + 4 * (Hdr.CompUnitCount + Hdr.LocalTypeUnitCount) + 8 * TU;
return Section.AccelSection.getU64(&Offset); return Section.AccelSection.getU64(&Offset);
} }
Expected<DWARFDebugNames::Entry> Expected<DWARFDebugNames::Entry>
DWARFDebugNames::NameIndex::getEntry(uint32_t *Offset) const { DWARFDebugNames::NameIndex::getEntry(uint32_t *Offset) const {
const DWARFDataExtractor &AS = Section.AccelSection; const DWARFDataExtractor &AS = Section.AccelSection;
if (!AS.isValidOffset(*Offset)) if (!AS.isValidOffset(*Offset))
return createStringError(errc::illegal_byte_sequence, return createStringError(errc::illegal_byte_sequence,
▲ Show 20 Lines • Show All 285 Lines • Show Last 20 Lines

llvm/trunk/test/tools/llvm-dwarfdump/X86/debug-names-many-tu.s

# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t
# RUN: llvm-dwarfdump -debug-names %t | FileCheck %s
# CHECK: LocalTU[0]: 0x0000000d
# CHECK-NEXT: LocalTU[1]: 0x00000028
# CHECK: ForeignTU[0]: 0x0011223344556677
# CHECK-NEXT: ForeignTU[1]: 0x1122334455667788
.section .debug_abbrev,"",@progbits
.byte 1 # Abbreviation Code
.byte 17 # DW_TAG_compile_unit
.byte 0 # DW_CHILDREN_no
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 2 # Abbreviation Code
.byte 19 # DW_TAG_structure_type
.byte 0 # DW_CHILDREN_no
.byte 3 # DW_AT_name
.byte 8 # DW_FORM_string
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 0
.section .debug_names,"",@progbits
.long .Lnames_end0-.Lnames_start0 # Header: unit length
.Lnames_start0:
.short 5 # Header: version
.short 0 # Header: padding
.long 1 # Header: compilation unit count
.long 2 # Header: local type unit count
.long 2 # Header: foreign type unit count
.long 0 # Header: bucket count
.long 2 # Header: name count
.long .Lnames_abbrev_end0-.Lnames_abbrev_start0 # Header: abbreviation table size
.long 0 # Header: augmentation string size
.long .Lcu_begin0 # Compilation unit 0
.long .Ltu_begin0 # Local TU 0
.long .Ltu_begin1 # Local TU 1
.quad 0x0011223344556677 # Foreign TU 0
.quad 0x1122334455667788 # Foreign TU 1
.long .Lstring0 # String in Bucket 0: A
.long .Lstring1 # String in Bucket 1: B
.long .Lnames0-.Lnames_entries0 # Offset in Bucket 0
.long .Lnames1-.Lnames_entries0 # Offset in Bucket 1
.Lnames_abbrev_start0:
.byte 1 # Abbrev code
.byte 19 # DW_TAG_structure_type
.byte 3 # DW_IDX_die_offset
.byte 19 # DW_FORM_ref4
.byte 0 # End of abbrev
.byte 0 # End of abbrev
.byte 0 # End of abbrev list
.Lnames_abbrev_end0:
.Lnames_entries0:
.Lnames0:
.byte 1 # Abbreviation code
.long .Ltu_die0-.Lcu_begin0 # DW_IDX_die_offset
.long 0 # End of list: A
.Lnames1:
.byte 1 # Abbreviation code
.long .Ltu_die1-.Lcu_begin0 # DW_IDX_die_offset
.long 0 # End of list: B
.p2align 2
.Lnames_end0:
.section .debug_info,"",@progbits
.Lcu_begin0:
.long .Lcu_end0-.Lcu_begin0-4 # Length of Unit
.short 5 # DWARF version number
.byte 1 # DW_UT_compile
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 1 # Abbrev [1] DW_TAG_compile_unit
.Lcu_end0:
.Ltu_begin0:
.long .Ltu_end0-.Ltu_begin0-4 # Length of Unit
.short 5 # DWARF version number
.byte 2 # DW_UT_type
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.quad 0x0011223344556677 # Type Signature
.long .Ltu_die0-.Ltu_begin0 # Type Offset
.Ltu_die0:
.byte 2 # Abbrev [2] DW_TAG_structure_type
.asciz "A"
.Ltu_end0:
.Ltu_begin1:
.long .Ltu_end1-.Ltu_begin1-4 # Length of Unit
.short 5 # DWARF version number
.byte 2 # DW_UT_type
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.quad 0x1122334455667788 # Type Signature
.long .Ltu_die1-.Ltu_begin1 # Type Offset
.Ltu_die1:
.byte 2 # Abbrev [1] 0xc:0x48 DW_TAG_structure_type
.asciz "B"
.Ltu_end1:
.section .debug_str,"MS",@progbits,1
.Lstring0:
.asciz "A"
.Lstring1:
.asciz "B"