This is an archive of the discontinued LLVM Phabricator instance.

Differential D85397

[DWARFYAML][debug_info] Make the 'Values' field optional.
ClosedPublic

Authored by Higuoxing on Aug 5 2020, 10:27 PM.

Details

Reviewers
jhenderson
grimar
MaskRay
• espindola
Commits
rG40506d5e2fc5: [DWARFYAML][debug_info] Make the 'Values' field optional.
Summary

This patch makes the 'Values' field optional. This is useful when we
handcraft the terminating entry of DIEs.

debug_info:
  - Version:  4
    ...
    Entries:
      - AbbrCode: 1
        Values:
          - Value: 0x1234
      - AbbrCode: 0 ## Termination

Diff Detail

Event Timeline

Higuoxing created this revision.Aug 5 2020, 10:27 PM
Herald added a reviewer: • espindola. · View Herald TranscriptAug 5 2020, 10:27 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, hiraditya, emaste. · View Herald Transcript
Higuoxing requested review of this revision.Aug 5 2020, 10:27 PM
Harbormaster completed remote builds in B67250: Diff 283486.Aug 5 2020, 10:56 PM
grimar accepted this revision.Aug 6 2020, 2:23 AM

LGTM. Though better wait for a second opinion.

llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml
846

the 'Values' entry -> the Values` key for an entry` I guess is more clear.
(At first I thought hat Values is a property of debug_info.)

This revision is now accepted and ready to land.Aug 6 2020, 2:23 AM
jhenderson accepted this revision.Aug 6 2020, 2:33 AM

LGTM too.

Higuoxing updated this revision to Diff 283582.Aug 6 2020, 5:43 AM
Higuoxing marked an inline comment as done.

Address review comments.

Thanks for reviewing!

This revision was landed with ongoing or failed builds.Aug 6 2020, 5:44 AM
Closed by commit rG40506d5e2fc5: [DWARFYAML][debug_info] Make the 'Values' field optional. (authored by Higuoxing). · Explain Why
This revision was automatically updated to reflect the committed changes.
Higuoxing added a commit: rG40506d5e2fc5: [DWARFYAML][debug_info] Make the 'Values' field optional..
Harbormaster completed remote builds in B67306: Diff 283582.Aug 6 2020, 6:12 AM

Revision Contents

PathSize
llvm/
lib/
ObjectYAML/
2 lines
test/
ObjectYAML/
MachO/
4 lines
4 lines
tools/
yaml2obj/
ELF/
DWARF/
32 lines

Diff 283583

llvm/lib/ObjectYAML/DWARFYAML.cpp

Show First 20 Lines • Show All 150 Lines • ▼ Show 20 Lines if (Unit.Version >= 5)
IO.mapRequired("UnitType", Unit.Type); IO.mapRequired("UnitType", Unit.Type);
IO.mapRequired("AbbrOffset", Unit.AbbrOffset); IO.mapRequired("AbbrOffset", Unit.AbbrOffset);
IO.mapRequired("AddrSize", Unit.AddrSize); IO.mapRequired("AddrSize", Unit.AddrSize);
IO.mapOptional("Entries", Unit.Entries); IO.mapOptional("Entries", Unit.Entries);
} }
void MappingTraits<DWARFYAML::Entry>::mapping(IO &IO, DWARFYAML::Entry &Entry) { void MappingTraits<DWARFYAML::Entry>::mapping(IO &IO, DWARFYAML::Entry &Entry) {
IO.mapRequired("AbbrCode", Entry.AbbrCode); IO.mapRequired("AbbrCode", Entry.AbbrCode);
IO.mapRequired("Values", Entry.Values); IO.mapOptional("Values", Entry.Values);
} }
void MappingTraits<DWARFYAML::FormValue>::mapping( void MappingTraits<DWARFYAML::FormValue>::mapping(
IO &IO, DWARFYAML::FormValue &FormValue) { IO &IO, DWARFYAML::FormValue &FormValue) {
IO.mapOptional("Value", FormValue.Value); IO.mapOptional("Value", FormValue.Value);
if (!FormValue.CStr.empty() || !IO.outputting()) if (!FormValue.CStr.empty() || !IO.outputting())
IO.mapOptional("CStr", FormValue.CStr); IO.mapOptional("CStr", FormValue.CStr);
if (!FormValue.BlockData.empty() || !IO.outputting()) if (!FormValue.BlockData.empty() || !IO.outputting())
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines

llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml

Show First 20 Lines • Show All 432 Lines • ▼ Show 20 Lines - Length: 117
BlockData: BlockData:
- 0x91 - 0x91
- 0x70 - 0x70
- Value: 0x0000000000000080 - Value: 0x0000000000000080
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- Value: 0x0000000000000003 - Value: 0x0000000000000003
- Value: 0x0000000000000067 - Value: 0x0000000000000067
- AbbrCode: 0x00000000 - AbbrCode: 0x00000000
Values:
- AbbrCode: 0x00000004 - AbbrCode: 0x00000004
Values: Values:
- Value: 0x0000000000000085 - Value: 0x0000000000000085
- Value: 0x0000000000000005 - Value: 0x0000000000000005
- Value: 0x0000000000000004 - Value: 0x0000000000000004
- AbbrCode: 0x00000005 - AbbrCode: 0x00000005
Values: Values:
- Value: 0x000000000000006C - Value: 0x000000000000006C
- AbbrCode: 0x00000005 - AbbrCode: 0x00000005
Values: Values:
- Value: 0x0000000000000071 - Value: 0x0000000000000071
- AbbrCode: 0x00000004 - AbbrCode: 0x00000004
Values: Values:
- Value: 0x0000000000000089 - Value: 0x0000000000000089
- Value: 0x0000000000000006 - Value: 0x0000000000000006
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- AbbrCode: 0x00000000 - AbbrCode: 0x00000000
Values:
debug_line: debug_line:
- Length: 65 - Length: 65
Version: 2 Version: 2
PrologueLength: 36 PrologueLength: 36
MinInstLength: 1 MinInstLength: 1
DefaultIsStmt: 1 DefaultIsStmt: 1
LineBase: 251 LineBase: 251
LineRange: 14 LineRange: 14
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000002 # DWARF32-NEXT: - Value: 0x0000000000000002
# DWARF32-NEXT: BlockData: [ 0x91, 0x70 ] # DWARF32-NEXT: BlockData: [ 0x91, 0x70 ]
# DWARF32-NEXT: - Value: 0x0000000000000080 # DWARF32-NEXT: - Value: 0x0000000000000080
# DWARF32-NEXT: - Value: 0x0000000000000001 # DWARF32-NEXT: - Value: 0x0000000000000001
# DWARF32-NEXT: - Value: 0x0000000000000003 # DWARF32-NEXT: - Value: 0x0000000000000003
# DWARF32-NEXT: - Value: 0x0000000000000067 # DWARF32-NEXT: - Value: 0x0000000000000067
# DWARF32-NEXT: - AbbrCode: 0x00000000 # DWARF32-NEXT: - AbbrCode: 0x00000000
# DWARF32-NEXT: Values:
# DWARF32-NEXT: - AbbrCode: 0x00000004 # DWARF32-NEXT: - AbbrCode: 0x00000004
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000085 # DWARF32-NEXT: - Value: 0x0000000000000085
# DWARF32-NEXT: - Value: 0x0000000000000005 # DWARF32-NEXT: - Value: 0x0000000000000005
# DWARF32-NEXT: - Value: 0x0000000000000004 # DWARF32-NEXT: - Value: 0x0000000000000004
# DWARF32-NEXT: - AbbrCode: 0x00000005 # DWARF32-NEXT: - AbbrCode: 0x00000005
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x000000000000006C # DWARF32-NEXT: - Value: 0x000000000000006C
# DWARF32-NEXT: - AbbrCode: 0x00000005 # DWARF32-NEXT: - AbbrCode: 0x00000005
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000071 # DWARF32-NEXT: - Value: 0x0000000000000071
# DWARF32-NEXT: - AbbrCode: 0x00000004 # DWARF32-NEXT: - AbbrCode: 0x00000004
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000089 # DWARF32-NEXT: - Value: 0x0000000000000089
# DWARF32-NEXT: - Value: 0x0000000000000006 # DWARF32-NEXT: - Value: 0x0000000000000006
# DWARF32-NEXT: - Value: 0x0000000000000001 # DWARF32-NEXT: - Value: 0x0000000000000001
# DWARF32-NEXT: - AbbrCode: 0x00000000 # DWARF32-NEXT: - AbbrCode: 0x00000000
# DWARF32-NEXT: Values:
## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back. ## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
## Test DWARF32 unit header. ## Test DWARF32 unit header.
# RUN: yaml2obj --docnum=2 -DFORMAT=DWARF32 %s | \ # RUN: yaml2obj --docnum=2 -DFORMAT=DWARF32 %s | \
# RUN: obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML # RUN: obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines

llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml

Show First 20 Lines • Show All 433 Lines • ▼ Show 20 Lines - Length: 118
BlockData: BlockData:
- 0x91 - 0x91
- 0x70 - 0x70
- Value: 0x0000000000000080 - Value: 0x0000000000000080
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- Value: 0x0000000000000003 - Value: 0x0000000000000003
- Value: 0x0000000000000067 - Value: 0x0000000000000067
- AbbrCode: 0x00000000 - AbbrCode: 0x00000000
Values:
- AbbrCode: 0x00000004 - AbbrCode: 0x00000004
Values: Values:
- Value: 0x0000000000000085 - Value: 0x0000000000000085
- Value: 0x0000000000000005 - Value: 0x0000000000000005
- Value: 0x0000000000000004 - Value: 0x0000000000000004
- AbbrCode: 0x00000005 - AbbrCode: 0x00000005
Values: Values:
- Value: 0x000000000000006C - Value: 0x000000000000006C
- AbbrCode: 0x00000005 - AbbrCode: 0x00000005
Values: Values:
- Value: 0x0000000000000071 - Value: 0x0000000000000071
- AbbrCode: 0x00000004 - AbbrCode: 0x00000004
Values: Values:
- Value: 0x0000000000000089 - Value: 0x0000000000000089
- Value: 0x0000000000000006 - Value: 0x0000000000000006
- Value: 0x0000000000000001 - Value: 0x0000000000000001
- AbbrCode: 0x00000000 - AbbrCode: 0x00000000
Values:
debug_line: debug_line:
- Length: 65 - Length: 65
Version: 2 Version: 2
PrologueLength: 36 PrologueLength: 36
MinInstLength: 1 MinInstLength: 1
DefaultIsStmt: 1 DefaultIsStmt: 1
LineBase: 251 LineBase: 251
LineRange: 14 LineRange: 14
▲ Show 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000002 # DWARF32-NEXT: - Value: 0x0000000000000002
# DWARF32-NEXT: BlockData: [ 0x91, 0x70 ] # DWARF32-NEXT: BlockData: [ 0x91, 0x70 ]
# DWARF32-NEXT: - Value: 0x0000000000000080 # DWARF32-NEXT: - Value: 0x0000000000000080
# DWARF32-NEXT: - Value: 0x0000000000000001 # DWARF32-NEXT: - Value: 0x0000000000000001
# DWARF32-NEXT: - Value: 0x0000000000000003 # DWARF32-NEXT: - Value: 0x0000000000000003
# DWARF32-NEXT: - Value: 0x0000000000000067 # DWARF32-NEXT: - Value: 0x0000000000000067
# DWARF32-NEXT: - AbbrCode: 0x00000000 # DWARF32-NEXT: - AbbrCode: 0x00000000
# DWARF32-NEXT: Values:
# DWARF32-NEXT: - AbbrCode: 0x00000004 # DWARF32-NEXT: - AbbrCode: 0x00000004
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000085 # DWARF32-NEXT: - Value: 0x0000000000000085
# DWARF32-NEXT: - Value: 0x0000000000000005 # DWARF32-NEXT: - Value: 0x0000000000000005
# DWARF32-NEXT: - Value: 0x0000000000000004 # DWARF32-NEXT: - Value: 0x0000000000000004
# DWARF32-NEXT: - AbbrCode: 0x00000005 # DWARF32-NEXT: - AbbrCode: 0x00000005
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x000000000000006C # DWARF32-NEXT: - Value: 0x000000000000006C
# DWARF32-NEXT: - AbbrCode: 0x00000005 # DWARF32-NEXT: - AbbrCode: 0x00000005
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000071 # DWARF32-NEXT: - Value: 0x0000000000000071
# DWARF32-NEXT: - AbbrCode: 0x00000004 # DWARF32-NEXT: - AbbrCode: 0x00000004
# DWARF32-NEXT: Values: # DWARF32-NEXT: Values:
# DWARF32-NEXT: - Value: 0x0000000000000089 # DWARF32-NEXT: - Value: 0x0000000000000089
# DWARF32-NEXT: - Value: 0x0000000000000006 # DWARF32-NEXT: - Value: 0x0000000000000006
# DWARF32-NEXT: - Value: 0x0000000000000001 # DWARF32-NEXT: - Value: 0x0000000000000001
# DWARF32-NEXT: - AbbrCode: 0x00000000 # DWARF32-NEXT: - AbbrCode: 0x00000000
# DWARF32-NEXT: Values:
## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back. ## b) Test that yaml2obj emits a correct unit header and obj2yaml is able to convert it back.
## Test DWARF32 unit header. ## Test DWARF32 unit header.
# RUN: yaml2obj --docnum=2 -DFORMAT=DWARF32 -DLENGTH=12 %s | \ # RUN: yaml2obj --docnum=2 -DFORMAT=DWARF32 -DLENGTH=12 %s | \
# RUN: obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML # RUN: obj2yaml | FileCheck %s --check-prefix=DWARF32-YAML
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines

llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml

Show First 20 Lines • Show All 836 Lines • ▼ Show 20 Lines - Version: 4
- Value: 0x1e ## DW_AT_comp_dir [DW_FORM_strp] - Value: 0x1e ## DW_AT_comp_dir [DW_FORM_strp]
- Value: 0x1120 ## DW_AT_low_pc [DW_FORM_addr] - Value: 0x1120 ## DW_AT_low_pc [DW_FORM_addr]
- Value: 0x33 ## DW_AT_high_pc [DW_FORM_data4] - Value: 0x33 ## DW_AT_high_pc [DW_FORM_data4]
- AbbrCode: 2 - AbbrCode: 2
Values: Values:
- Value: 0x1120 ## DW_AT_low_pc [DW_FORM_addr] - Value: 0x1120 ## DW_AT_low_pc [DW_FORM_addr]
- Value: 0x06 ## DW_AT_high_pc [DW_FORM_data4] - Value: 0x06 ## DW_AT_high_pc [DW_FORM_data4]
- Value: 0x38 ## DW_AT_name [DW_FORM_strp] - Value: 0x38 ## DW_AT_name [DW_FORM_strp]
## l) Test that if we don't specify the 'Values' key for an entry, yaml2obj will only emit the abbrev_code.
grimarUnsubmitted
Done
ReplyInline Actions

the 'Values' entry -> the Values` key for an entry` I guess is more clear.
(At first I thought hat Values is a property of debug_info.)

grimar: `the 'Values' entry` -> `the `Values` key for an entry` I guess is more clear. (At first I…
# RUN: yaml2obj --docnum=14 %s -o %t14.o
# RUN: llvm-readelf --hex-dump=.debug_info %t14.o | \
# RUN: FileCheck %s --check-prefix=NO-VALUES
# NO-VALUES: Hex dump of section '.debug_info':
# NO-VALUES-NEXT: 0x00000000 0a000000 04000000 00000801 0002 ..............
## ^------- unit_length (4-byte)
## ^--- version (2-byte)
## ^-------- debug_abbrev_offset (4-byte)
## ^- address_size (1-byte)
## ^- abbrev_code (ULEB128) 0x01
## ^- abbrev_code (ULEB128) 0x00
## ^- abbrev_code (ULEB128) 0x02
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
DWARF:
debug_info:
- Version: 4
AbbrOffset: 0x00
AddrSize: 0x08
Entries:
- AbbrCode: 1
- AbbrCode: 0
- AbbrCode: 2