RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

[DWARFYAML] Offsets should be omitted when the OffsetEntryCount is 0.

Browse Source 
The offsets field should be omitted when the 'OffsetEntryCount' entry is
specified to be 0.

Reviewed By: jhenderson

Differential Revision: https://reviews.llvm.org/D85006
This commit is contained in:
Xing GUO 2020-08-03 22:04:33 +08:00
parent c177fc936f
commit f5eb618063
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ObjectYAML/DWARFEmitter.cpp
View File

@ -749,7 +749,7 @@ Error writeDWARFLists(raw_ostream &OS,
EmitOffsets(ArrayRef<uint64_t>((const uint64_t *)Table.Offsets->data(),
Table.Offsets->size()),
0);
else
else if (OffsetEntryCount != 0)
EmitOffsets(Offsets, OffsetsSize);
OS.write(ListBuffer.data(), ListBuffer.size());

64
test/tools/yaml2obj/ELF/DWARF/debug-rnglists.yaml
View File

@ -669,3 +669,67 @@ DWARF:
- Lists:
- Entries: []
Content: ''
## u) Test that when the "OffsetEntryCount" is specified to be 0 and "Offsets" is not specified,
## the offsets array is not emitted.
# RUN: yaml2obj --docnum=19 -DENTRYCOUNT=0 %s -o %t19.o
# RUN: llvm-readelf --hex-dump=.debug_rnglists %t19.o | \
# RUN: FileCheck %s --check-prefix=NO-OFFSETS
# NO-OFFSETS: Hex dump of section '.debug_rnglists':
# NO-OFFSETS-NEXT: 0x00000000 0e000000 05000800 00000000 02010202 ................
## ^------- offset_entry_count (4-byte)
## ^- DW_RLE_startx_endx
## ^- operands[0] (ULEB128) 0x01
## ^- operands[1] (ULEB128) 0x02
## ^- DW_RLE_startx_endx
# NO-OFFSETS-NEXT: 0x00000010 0102 ..
## ^- operands[0] (ULEB128) 0x01
## ^- operands[1] (ULEB128) 0x02
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
DWARF:
debug_rnglists:
- OffsetEntryCount: [[ENTRYCOUNT=<none>]]
Offsets: [[OFFSETS=<none>]]
Lists:
- Entries:
- Operator: DW_RLE_startx_endx
Values: [ 0x01, 0x02 ]
- Entries:
- Operator: DW_RLE_startx_endx
Values: [ 0x01, 0x02 ]
## v) Test that when the "Offsets" entry is specified to be empty and the "OffsetEntryCount" is not specified,
## the offsets array will be omitted.
# RUN: yaml2obj --docnum=19 -DOFFSETS=[] %s -o %t20.o
# RUN: llvm-readelf --hex-dump=.debug_rnglists %t20.o | \
# RUN: FileCheck %s --check-prefix=NO-OFFSETS
## w) Test that if "Offsets" is specified, the offsets array will be emitted accordingly, even when
## the "OffsetEntryCount" is specified to be 0.
# RUN: yaml2obj --docnum=19 -DOFFSETS=[0x01,0x02,0x03] -DENTRYCOUNT=0 %s -o %t21.o
# RUN: llvm-readelf --hex-dump=.debug_rnglists %t21.o | \
# RUN: FileCheck %s --check-prefix=OFFSETS
# OFFSETS: Hex dump of section '.debug_rnglists':
# OFFSETS-NEXT: 0x00000000 0e000000 05000800 00000000 01000000 ................
## ^------- offset_entry_count (4-byte)
## ^------- offsets[0] (4-byte)
# OFFSETS-NEXT: 0x00000010 02000000 03000000 02010202 0102 ..............
## ^------- offsets[1] (4-byte)
## ^------- offsets[2] (4-byte)
## ^- DW_RLE_startx_endx
## ^- operands[0] (ULEB128) 0x01
## ^- operands[1] (ULEB128) 0x02
## ^- DW_RLE_startx_endx
## ^- operands[0] (ULEB128) 0x01
## ^- operands[1] (ULEB128) 0x02