[lldb][DWARF][NFC] Reduce scope of ref_addr_size variable #146557
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Member
|
@llvm/pr-subscribers-lldb Author: Michael Buch (Michael137) ChangesFollow-up to #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. Full diff: https://github.com/llvm/llvm-project/pull/146557.diff 1 Files Affected:
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
index 2e98e3c33acaf..6a657086608b8 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
@@ -36,7 +36,6 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
bool indirect = false;
bool is_block = false;
m_value.data = nullptr;
- uint8_t ref_addr_size;
// Read the value for the form into value and follow and DW_FORM_indirect
// instances we run into
do {
@@ -76,11 +75,11 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
break;
case DW_FORM_strp:
case DW_FORM_line_strp:
- case DW_FORM_sec_offset:
+ case DW_FORM_sec_offset: {
assert(m_unit);
- ref_addr_size = m_unit->GetFormParams().getDwarfOffsetByteSize();
+ uint8_t ref_addr_size = m_unit->GetFormParams().getDwarfOffsetByteSize();
m_value.uval = data.GetMaxU64(offset_ptr, ref_addr_size);
- break;
+ } break;
case DW_FORM_addrx1:
case DW_FORM_strx1:
case DW_FORM_ref1:
@@ -119,11 +118,11 @@ bool DWARFFormValue::ExtractValue(const DWARFDataExtractor &data,
case DW_FORM_GNU_addr_index:
m_value.uval = data.GetULEB128(offset_ptr);
break;
- case DW_FORM_ref_addr:
+ case DW_FORM_ref_addr: {
assert(m_unit);
- ref_addr_size = m_unit->GetFormParams().getRefAddrByteSize();
+ uint8_t ref_addr_size = m_unit->GetFormParams().getRefAddrByteSize();
m_value.uval = data.GetMaxU64(offset_ptr, ref_addr_size);
- break;
+ } break;
case DW_FORM_indirect:
m_form = static_cast<dw_form_t>(data.GetULEB128(offset_ptr));
indirect = true;
@@ -208,7 +207,6 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
const DWARFDataExtractor &debug_info_data,
lldb::offset_t *offset_ptr,
const DWARFUnit *unit) {
- uint8_t ref_addr_size;
switch (form) {
// Blocks if inlined data that have a length field and the data bytes inlined
// in the .debug_info
@@ -244,12 +242,13 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
*offset_ptr += DWARFUnit::GetAddressByteSize(unit);
return true;
- case DW_FORM_ref_addr:
+ case DW_FORM_ref_addr: {
assert(unit); // Unit must be valid for DW_FORM_ref_addr objects or we will
// get this wrong
- ref_addr_size = unit->GetFormParams().getRefAddrByteSize();
+ uint8_t ref_addr_size = unit->GetFormParams().getRefAddrByteSize();
*offset_ptr += ref_addr_size;
return true;
+ }
// 0 bytes values (implied from DW_FORM)
case DW_FORM_flag_present:
@@ -282,11 +281,12 @@ bool DWARFFormValue::SkipValue(dw_form_t form,
// 32 bit for DWARF 32, 64 for DWARF 64
case DW_FORM_sec_offset:
case DW_FORM_strp:
- case DW_FORM_line_strp:
+ case DW_FORM_line_strp: {
assert(unit);
- ref_addr_size = unit->GetFormParams().getDwarfOffsetByteSize();
+ uint8_t ref_addr_size = unit->GetFormParams().getDwarfOffsetByteSize();
*offset_ptr += ref_addr_size;
return true;
+ }
// 4 byte values
case DW_FORM_addrx4:
|
labath
approved these changes
Jul 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #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.
This patch just inlines the usage of the variable entirely.