Skip to content

Commit 06ccadc

Browse files
committed
[lldb][DWARF][NFC] Reduce scope of ref_addr_size variable
Follow-up to llvm#145645 (comment) There's no need for this variable to be declared at the function-level. We reset it in all the cases where it's used anyway.
1 parent 569ca0f commit 06ccadc

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
3636
bool indirect = false;
3737
bool is_block = false;
3838
m_value.data = nullptr;
39-
uint8_t ref_addr_size;
4039
// Read the value for the form into value and follow and DW_FORM_indirect
4140
// instances we run into
4241
do {
@@ -76,11 +75,11 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
7675
break;
7776
case DW_FORM_strp:
7877
case DW_FORM_line_strp:
79-
case DW_FORM_sec_offset:
78+
case DW_FORM_sec_offset: {
8079
assert(m_unit);
81-
ref_addr_size = m_unit->GetFormParams().getDwarfOffsetByteSize();
80+
uint8_t ref_addr_size = m_unit->GetFormParams().getDwarfOffsetByteSize();
8281
m_value.uval = data.GetMaxU64(offset_ptr, ref_addr_size);
83-
break;
82+
} break;
8483
case DW_FORM_addrx1:
8584
case DW_FORM_strx1:
8685
case DW_FORM_ref1:
@@ -119,11 +118,11 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
119118
case DW_FORM_GNU_addr_index:
120119
m_value.uval = data.GetULEB128(offset_ptr);
121120
break;
122-
case DW_FORM_ref_addr:
121+
case DW_FORM_ref_addr: {
123122
assert(m_unit);
124-
ref_addr_size = m_unit->GetFormParams().getRefAddrByteSize();
123+
uint8_t ref_addr_size = m_unit->GetFormParams().getRefAddrByteSize();
125124
m_value.uval = data.GetMaxU64(offset_ptr, ref_addr_size);
126-
break;
125+
} break;
127126
case DW_FORM_indirect:
128127
m_form = static_cast<dw_form_t>(data.GetULEB128(offset_ptr));
129128
indirect = true;
@@ -208,7 +207,6 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
208207
const DWARFDataExtractor &debug_info_data,
209208
lldb::offset_t *offset_ptr,
210209
const DWARFUnit *unit) {
211-
uint8_t ref_addr_size;
212210
switch (form) {
213211
// Blocks if inlined data that have a length field and the data bytes inlined
214212
// in the .debug_info
@@ -244,12 +242,13 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
244242
*offset_ptr += DWARFUnit::GetAddressByteSize(unit);
245243
return true;
246244

247-
case DW_FORM_ref_addr:
245+
case DW_FORM_ref_addr: {
248246
assert(unit); // Unit must be valid for DW_FORM_ref_addr objects or we will
249247
// get this wrong
250-
ref_addr_size = unit->GetFormParams().getRefAddrByteSize();
248+
uint8_t ref_addr_size = unit->GetFormParams().getRefAddrByteSize();
251249
*offset_ptr += ref_addr_size;
252250
return true;
251+
}
253252

254253
// 0 bytes values (implied from DW_FORM)
255254
case DW_FORM_flag_present:
@@ -282,11 +281,12 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
282281
// 32 bit for DWARF 32, 64 for DWARF 64
283282
case DW_FORM_sec_offset:
284283
case DW_FORM_strp:
285-
case DW_FORM_line_strp:
284+
case DW_FORM_line_strp: {
286285
assert(unit);
287-
ref_addr_size = unit->GetFormParams().getDwarfOffsetByteSize();
286+
uint8_t ref_addr_size = unit->GetFormParams().getDwarfOffsetByteSize();
288287
*offset_ptr += ref_addr_size;
289288
return true;
289+
}
290290

291291
// 4 byte values
292292
case DW_FORM_addrx4:

0 commit comments

Comments
 (0)