@@ -36,7 +36,6 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
36
36
bool indirect = false ;
37
37
bool is_block = false ;
38
38
m_value.data = nullptr ;
39
- uint8_t ref_addr_size;
40
39
// Read the value for the form into value and follow and DW_FORM_indirect
41
40
// instances we run into
42
41
do {
@@ -78,8 +77,8 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
78
77
case DW_FORM_line_strp:
79
78
case DW_FORM_sec_offset:
80
79
assert (m_unit);
81
- ref_addr_size = m_unit-> GetFormParams (). getDwarfOffsetByteSize ();
82
- m_value. uval = data. GetMaxU64 ( offset_ptr, ref_addr_size );
80
+ m_value. uval = data. GetMaxU64 (
81
+ offset_ptr, m_unit-> GetFormParams (). getDwarfOffsetByteSize () );
83
82
break ;
84
83
case DW_FORM_addrx1:
85
84
case DW_FORM_strx1:
@@ -121,8 +120,8 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
121
120
break ;
122
121
case DW_FORM_ref_addr:
123
122
assert (m_unit);
124
- ref_addr_size = m_unit-> GetFormParams (). getRefAddrByteSize ();
125
- m_value. uval = data. GetMaxU64 ( offset_ptr, ref_addr_size );
123
+ m_value. uval = data. GetMaxU64 (
124
+ offset_ptr, m_unit-> GetFormParams (). getRefAddrByteSize () );
126
125
break ;
127
126
case DW_FORM_indirect:
128
127
m_form = static_cast <dw_form_t >(data.GetULEB128 (offset_ptr));
@@ -208,7 +207,6 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
208
207
const DWARFDataExtractor &debug_info_data,
209
208
lldb::offset_t *offset_ptr,
210
209
const DWARFUnit *unit) {
211
- uint8_t ref_addr_size;
212
210
switch (form) {
213
211
// Blocks if inlined data that have a length field and the data bytes inlined
214
212
// in the .debug_info
@@ -247,8 +245,7 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
247
245
case DW_FORM_ref_addr:
248
246
assert (unit); // Unit must be valid for DW_FORM_ref_addr objects or we will
249
247
// get this wrong
250
- ref_addr_size = unit->GetFormParams ().getRefAddrByteSize ();
251
- *offset_ptr += ref_addr_size;
248
+ *offset_ptr += unit->GetFormParams ().getRefAddrByteSize ();
252
249
return true ;
253
250
254
251
// 0 bytes values (implied from DW_FORM)
@@ -284,8 +281,7 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
284
281
case DW_FORM_strp:
285
282
case DW_FORM_line_strp:
286
283
assert (unit);
287
- ref_addr_size = unit->GetFormParams ().getDwarfOffsetByteSize ();
288
- *offset_ptr += ref_addr_size;
284
+ *offset_ptr += unit->GetFormParams ().getDwarfOffsetByteSize ();
289
285
return true ;
290
286
291
287
// 4 byte values
0 commit comments