Skip to content

Commit 5c6307e

Browse files
committed
fixup! no need for local variable at all
1 parent 06ccadc commit 5c6307e

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

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

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
7575
break;
7676
case DW_FORM_strp:
7777
case DW_FORM_line_strp:
78-
case DW_FORM_sec_offset: {
78+
case DW_FORM_sec_offset:
7979
assert(m_unit);
80-
uint8_t ref_addr_size = m_unit->GetFormParams().getDwarfOffsetByteSize();
81-
m_value.uval = data.GetMaxU64(offset_ptr, ref_addr_size);
82-
} break;
80+
m_value.uval = data.GetMaxU64(
81+
offset_ptr, m_unit->GetFormParams().getDwarfOffsetByteSize());
82+
break;
8383
case DW_FORM_addrx1:
8484
case DW_FORM_strx1:
8585
case DW_FORM_ref1:
@@ -118,11 +118,11 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
118118
case DW_FORM_GNU_addr_index:
119119
m_value.uval = data.GetULEB128(offset_ptr);
120120
break;
121-
case DW_FORM_ref_addr: {
121+
case DW_FORM_ref_addr:
122122
assert(m_unit);
123-
uint8_t ref_addr_size = m_unit->GetFormParams().getRefAddrByteSize();
124-
m_value.uval = data.GetMaxU64(offset_ptr, ref_addr_size);
125-
} break;
123+
m_value.uval = data.GetMaxU64(
124+
offset_ptr, m_unit->GetFormParams().getRefAddrByteSize());
125+
break;
126126
case DW_FORM_indirect:
127127
m_form = static_cast<dw_form_t>(data.GetULEB128(offset_ptr));
128128
indirect = true;
@@ -242,13 +242,11 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
242242
*offset_ptr += DWARFUnit::GetAddressByteSize(unit);
243243
return true;
244244

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

253251
// 0 bytes values (implied from DW_FORM)
254252
case DW_FORM_flag_present:
@@ -281,12 +279,10 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
281279
// 32 bit for DWARF 32, 64 for DWARF 64
282280
case DW_FORM_sec_offset:
283281
case DW_FORM_strp:
284-
case DW_FORM_line_strp: {
282+
case DW_FORM_line_strp:
285283
assert(unit);
286-
uint8_t ref_addr_size = unit->GetFormParams().getDwarfOffsetByteSize();
287-
*offset_ptr += ref_addr_size;
284+
*offset_ptr += unit->GetFormParams().getDwarfOffsetByteSize();
288285
return true;
289-
}
290286

291287
// 4 byte values
292288
case DW_FORM_addrx4:

0 commit comments

Comments
 (0)