@@ -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 {
@@ -78,8 +77,8 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
7877 case DW_FORM_line_strp:
7978 case DW_FORM_sec_offset:
8079 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 () );
8382 break ;
8483 case DW_FORM_addrx1:
8584 case DW_FORM_strx1:
@@ -121,8 +120,8 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
121120 break ;
122121 case DW_FORM_ref_addr:
123122 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 () );
126125 break ;
127126 case DW_FORM_indirect:
128127 m_form = static_cast <dw_form_t >(data.GetULEB128 (offset_ptr));
@@ -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
@@ -247,8 +245,7 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
247245 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 ();
251- *offset_ptr += ref_addr_size;
248+ *offset_ptr += unit->GetFormParams ().getRefAddrByteSize ();
252249 return true ;
253250
254251 // 0 bytes values (implied from DW_FORM)
@@ -284,8 +281,7 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
284281 case DW_FORM_strp:
285282 case DW_FORM_line_strp:
286283 assert (unit);
287- ref_addr_size = unit->GetFormParams ().getDwarfOffsetByteSize ();
288- *offset_ptr += ref_addr_size;
284+ *offset_ptr += unit->GetFormParams ().getDwarfOffsetByteSize ();
289285 return true ;
290286
291287 // 4 byte values
0 commit comments