Skip to content

Commit 063a102

Browse files
sayhaanaaryanshukla
sayhaan
authored and
aaryanshukla
committed
[BOLT][DWARF] Cleanup buffer initialization for DWO range writer (llvm#97843)
Cleanup buffer initialization for DWO range writer instances to remove empty buffer at the beginning.
1 parent eb1efd8 commit 063a102

File tree

7 files changed

+65
-63
lines changed

7 files changed

+65
-63
lines changed

‎bolt/include/bolt/Core/DebugData.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ class DebugRangesSectionWriter {
226226
/// Needs to be invoked before each \p CU is processed.
227227
void virtual initSection(DWARFUnit &CU){};
228228

229+
/// Initializes Ranges section with empty list.
230+
void initSection();
231+
229232
protected:
230233
std::unique_ptr<DebugBufferVector> RangesBuffer;
231234

‎bolt/lib/Core/DebugData.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,14 @@ DebugRangesSectionWriter::DebugRangesSectionWriter() {
137137
RangesBuffer = std::make_unique<DebugBufferVector>();
138138
RangesStream = std::make_unique<raw_svector_ostream>(*RangesBuffer);
139139

140-
// Add an empty range as the first entry;
141-
writeAddressRanges(*RangesStream.get(), DebugAddressRangesVector{});
142140
Kind = RangesWriterKind::DebugRangesWriter;
143141
}
144142

143+
void DebugRangesSectionWriter::initSection() {
144+
// Adds an empty range to the buffer.
145+
writeAddressRanges(*RangesStream.get(), DebugAddressRangesVector{});
146+
}
147+
145148
uint64_t DebugRangesSectionWriter::addRanges(
146149
DebugAddressRangesVector &&Ranges,
147150
std::map<DebugAddressRangesVector, uint64_t> &CachedRanges) {

‎bolt/lib/Rewrite/DWARFRewriter.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,10 @@ void DWARFRewriter::updateDebugInfo() {
620620
AddrWriter = std::make_unique<DebugAddrWriter>(&BC);
621621
}
622622

623-
if (BC.isDWARFLegacyUsed())
623+
if (BC.isDWARFLegacyUsed()) {
624624
LegacyRangesSectionWriter = std::make_unique<DebugRangesSectionWriter>();
625+
LegacyRangesSectionWriter->initSection();
626+
}
625627

626628
DebugLoclistWriter::setAddressWriter(AddrWriter.get());
627629

@@ -651,7 +653,6 @@ void DWARFRewriter::updateDebugInfo() {
651653
"LegacyRangeLists writer for DWO unit already exists.");
652654
auto LegacyRangesSectionWriterByCU =
653655
std::make_unique<DebugRangesSectionWriter>();
654-
LegacyRangesSectionWriterByCU->initSection(CU);
655656
LegacyRangesWritersByCU[*DWOId] =
656657
std::move(LegacyRangesSectionWriterByCU);
657658
}

‎bolt/test/X86/debug-fission-single-convert.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727

2828
# CHECK-NOT: warning: DWARF unit from offset {{.*}} incl. to offset {{.*}} excl. tries to read DIEs at offset {{.*}}
2929

30+
# CHECK-DWO-DWO: 00000000
3031
# CHECK-DWO-DWO: 00000010
3132
# CHECK-DWO-DWO: 00000010
32-
# CHECK-DWO-DWO: 00000050
3333
# CHECK-DWO-DWO: DW_TAG_subprogram
34-
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
34+
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
3535
# CHECK-DWO-DWO: DW_TAG_subprogram
36-
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000030
36+
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000020
3737
# CHECK-DWO-DWO: DW_TAG_subprogram
38-
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
38+
# CHECK-DWO-DWO-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
3939

4040
# CHECK-ADDR-SEC: .debug_addr contents:
4141
# CHECK-ADDR-SEC: 0x00000000: Addrs: [

‎bolt/test/X86/dwarf4-df-dualcu.test‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@
4040
; BOLT-NEXT: 00000010 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
4141
; BOLT-NEXT: 00000010 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
4242
; BOLT-NEXT: 00000010 <End of list>
43+
; BOLT-NEXT: 00000040 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
4344
; BOLT-NEXT: 00000040 <End of list>
44-
; BOLT-NEXT: 00000050 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
45-
; BOLT-NEXT: 00000050 <End of list>
46-
; BOLT-NEXT: 00000070 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
47-
; BOLT-NEXT: 00000070 <End of list>
48-
; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
49-
; BOLT-NEXT: 00000090 <End of list>
50-
; BOLT-NEXT: 000000b0 <End of list>
51-
; BOLT-NEXT: 000000c0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
52-
; BOLT-NEXT: 000000c0 <End of list>
45+
; BOLT-NEXT: 00000060 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
46+
; BOLT-NEXT: 00000060 <End of list>
47+
; BOLT-NEXT: 00000080 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
48+
; BOLT-NEXT: 00000080 <End of list>
49+
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
50+
; BOLT-NEXT: 000000a0 <End of list>
5351

5452
; BOLT: DW_TAG_compile_unit
5553
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000016] = "main.dwo.dwo")
@@ -65,10 +63,10 @@
6563
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x00000023] = "helper.dwo.dwo")
6664
; BOLT-NEXT: DW_AT_GNU_dwo_id
6765
; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
68-
; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000090
66+
; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000080
6967
; BOLT-NEXT: [0x[[#ADDR3]], 0x[[#ADDRB3]])
7068
; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000010)
71-
; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000000b0)
69+
; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000000a0)
7270

7371
; PRE-BOLT-DWO-MAIN: version = 0x0004
7472
; PRE-BOLT-DWO-MAIN: DW_TAG_compile_unit
@@ -115,13 +113,13 @@
115113
; BOLT-DWO-MAIN-NEXT: DW_AT_decl_line
116114
; BOLT-DWO-MAIN-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_GNU_addr_index 0x1)
117115
; BOLT-DWO-MAIN: DW_TAG_subprogram [4]
118-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
116+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
119117
; BOLT-DWO-MAIN-NEXT: )
120118
; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base
121119
; BOLT-DWO-MAIN-NEXT: DW_AT_linkage_name [DW_FORM_GNU_str_index] (indexed (00000003) string = "_Z3usePiS_")
122120
; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000004) string = "use")
123121
; BOLT-DWO-MAIN: DW_TAG_subprogram [6]
124-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000030
122+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000020
125123
; BOLT-DWO-MAIN-NEXT: )
126124
; BOLT-DWO-MAIN-NEXT: DW_AT_frame_base [DW_FORM_exprloc] (DW_OP_reg6 RBP)
127125
; BOLT-DWO-MAIN-NEXT: DW_AT_name [DW_FORM_GNU_str_index] (indexed (00000005) string = "main")
@@ -162,4 +160,4 @@
162160
; BOLT-DWO-HELPER-NEXT: DW_AT_decl_line
163161
; BOLT-DWO-HELPER-NEXT: DW_AT_location [DW_FORM_exprloc] (DW_OP_GNU_addr_index 0x1)
164162
; BOLT-DWO-HELPER: DW_TAG_subprogram [4]
165-
; BOLT-DWO-HELPER-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
163+
; BOLT-DWO-HELPER-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000

‎bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,30 @@
2525
; BOLT-NEXT: 00000010 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
2626
; BOLT-NEXT: 00000010 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
2727
; BOLT-NEXT: 00000010 <End of list>
28+
; BOLT-NEXT: 00000090 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
29+
; BOLT-NEXT: 00000090 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
30+
; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
2831
; BOLT-NEXT: 00000090 <End of list>
29-
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
30-
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
31-
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
32-
; BOLT-NEXT: 000000a0 <End of list>
33-
; BOLT-NEXT: 000000e0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
34-
; BOLT-NEXT: 000000e0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
35-
; BOLT-NEXT: 000000e0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
36-
; BOLT-NEXT: 000000e0 <End of list>
37-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
38-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
39-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
40-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR11:]] [[#%.16x,ADDRB11:]]
41-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
42-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
43-
; BOLT-NEXT: 00000120 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
44-
; BOLT-NEXT: 00000120 <End of list>
45-
; BOLT-NEXT: 000001a0 <End of list>
46-
; BOLT-NEXT: 000001b0 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
47-
; BOLT-NEXT: 000001b0 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
48-
; BOLT-NEXT: 000001b0 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
49-
; BOLT-NEXT: 000001b0 <End of list>
50-
; BOLT-NEXT: 000001f0 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
51-
; BOLT-NEXT: 000001f0 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
52-
; BOLT-NEXT: 000001f0 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
53-
; BOLT-NEXT: 000001f0 <End of list>
32+
; BOLT-NEXT: 000000d0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
33+
; BOLT-NEXT: 000000d0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
34+
; BOLT-NEXT: 000000d0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
35+
; BOLT-NEXT: 000000d0 <End of list>
36+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
37+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
38+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
39+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR11:]] [[#%.16x,ADDRB11:]]
40+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
41+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
42+
; BOLT-NEXT: 00000110 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
43+
; BOLT-NEXT: 00000110 <End of list>
44+
; BOLT-NEXT: 00000190 [[#%.16x,ADDR8:]] [[#%.16x,ADDRB8:]]
45+
; BOLT-NEXT: 00000190 [[#%.16x,ADDR9:]] [[#%.16x,ADDRB9:]]
46+
; BOLT-NEXT: 00000190 [[#%.16x,ADDR10:]] [[#%.16x,ADDRB10:]]
47+
; BOLT-NEXT: 00000190 <End of list>
48+
; BOLT-NEXT: 000001d0 [[#%.16x,ADDR12:]] [[#%.16x,ADDRB12:]]
49+
; BOLT-NEXT: 000001d0 [[#%.16x,ADDR13:]] [[#%.16x,ADDRB13:]]
50+
; BOLT-NEXT: 000001d0 [[#%.16x,ADDR14:]] [[#%.16x,ADDRB14:]]
51+
; BOLT-NEXT: 000001d0 <End of list>
5452

5553
; BOLT: DW_TAG_compile_unit
5654
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "main.dwo.dwo")
@@ -71,9 +69,9 @@
7169
; BOLT: DW_TAG_compile_unit
7270
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "mainOther.dwo.dwo")
7371
; BOLT-NEXT: DW_AT_GNU_dwo_id
74-
; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x000001a0)
72+
; BOLT-NEXT: DW_AT_GNU_ranges_base [DW_FORM_sec_offset] (0x00000190)
7573
; BOLT-NEXT: DW_AT_low_pc [DW_FORM_addr] (0x0000000000000000)
76-
; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000120
74+
; BOLT-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000110
7775
; BOLT-NEXT: [0x[[#ADDR8]], 0x[[#ADDRB8]])
7876
; BOLT-NEXT: [0x[[#ADDR9]], 0x[[#ADDRB9]])
7977
; BOLT-NEXT: [0x[[#ADDR10]], 0x[[#ADDRB10]])
@@ -85,17 +83,17 @@
8583
; BOLT: {{^$}}
8684

8785
; BOLT-DWO-MAIN: DW_TAG_subprogram
88-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
86+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
8987
; BOLT-DWO-MAIN: DW_TAG_subprogram
9088
; BOLT-DWO-MAIN: DW_TAG_subprogram
9189
; BOLT-DWO-MAIN: DW_TAG_subprogram
9290
; BOLT-DWO-MAIN: DW_TAG_subprogram
93-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
91+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040
9492

9593
; BOLT-DWO-MAIN: DW_TAG_subprogram
96-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
94+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
9795
; BOLT-DWO-MAIN: DW_TAG_subprogram
9896
; BOLT-DWO-MAIN: DW_TAG_subprogram
9997
; BOLT-DWO-MAIN: DW_TAG_subprogram
10098
; BOLT-DWO-MAIN: DW_TAG_subprogram
101-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
99+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040

‎bolt/test/X86/dwarf4-df-input-lowpc-ranges.test‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@
2323
; BOLT-NEXT: 00000010 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
2424
; BOLT-NEXT: 00000010 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
2525
; BOLT-NEXT: 00000010 <End of list>
26+
; BOLT-NEXT: 00000090 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
27+
; BOLT-NEXT: 00000090 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
28+
; BOLT-NEXT: 00000090 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
2629
; BOLT-NEXT: 00000090 <End of list>
27-
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR1:]] [[#%.16x,ADDRB1:]]
28-
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR2:]] [[#%.16x,ADDRB2:]]
29-
; BOLT-NEXT: 000000a0 [[#%.16x,ADDR3:]] [[#%.16x,ADDRB3:]]
30-
; BOLT-NEXT: 000000a0 <End of list>
31-
; BOLT-NEXT: 000000e0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
32-
; BOLT-NEXT: 000000e0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
33-
; BOLT-NEXT: 000000e0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
34-
; BOLT-NEXT: 000000e0 <End of list>
30+
; BOLT-NEXT: 000000d0 [[#%.16x,ADDR5:]] [[#%.16x,ADDRB5:]]
31+
; BOLT-NEXT: 000000d0 [[#%.16x,ADDR6:]] [[#%.16x,ADDRB6:]]
32+
; BOLT-NEXT: 000000d0 [[#%.16x,ADDR7:]] [[#%.16x,ADDRB7:]]
33+
; BOLT-NEXT: 000000d0 <End of list>
3534

3635
; BOLT: DW_TAG_compile_unit
3736
; BOLT: DW_AT_GNU_dwo_name [DW_FORM_strp] ( .debug_str[0x{{[0-9a-fA-F]+}}] = "main.dwo.dwo")
@@ -49,9 +48,9 @@
4948
; BOLT-NEXT: DW_AT_GNU_addr_base [DW_FORM_sec_offset] (0x00000000)
5049

5150
; BOLT-DWO-MAIN: DW_TAG_subprogram
52-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000010
51+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000000
5352
; BOLT-DWO-MAIN: DW_TAG_subprogram
5453
; BOLT-DWO-MAIN: DW_TAG_subprogram
5554
; BOLT-DWO-MAIN: DW_TAG_subprogram
5655
; BOLT-DWO-MAIN: DW_TAG_subprogram
57-
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000050
56+
; BOLT-DWO-MAIN-NEXT: DW_AT_ranges [DW_FORM_sec_offset] (0x00000040

0 commit comments

Comments
 (0)