Skip to content

Commit 3053907

Browse files
labathlabath
committed
[lldb] Add Function::GetAddress and redirect some uses
Many calls to Function::GetAddressRange() were not interested in the range itself. Instead they wanted to find the address of the function (its entry point) or the base address for relocation of function-scoped entities. This PR creates a separate function for retrieving this, and changes the existing (non-controversial) uses to call that instead.
1 parent a261eee commit 3053907

File tree

22 files changed

+49
-64
lines changed

22 files changed

+49
-64
lines changed

‎lldb/include/lldb/Symbol/Function.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,11 @@ class Function : public UserID, public SymbolContextScope {
449449

450450
AddressRanges GetAddressRanges() { return m_block.GetRanges(); }
451451

452+
/// Return the address of the function (its entry point). This address is also
453+
/// used as a base address for relocation of function-scope entities (blocks
454+
/// and variables).
455+
const Address &GetAddress() const { return m_address; }
456+
452457
lldb::LanguageType GetLanguage() const;
453458
/// Find the file and line number of the source location of the start of the
454459
/// function. This will use the declaration if present and fall back on the
@@ -658,6 +663,9 @@ class Function : public UserID, public SymbolContextScope {
658663
/// include addresses belonging to other functions.
659664
AddressRange m_range;
660665

666+
/// The address (entry point) of the function.
667+
Address m_address;
668+
661669
/// The frame base expression for variables that are relative to the frame
662670
/// pointer.
663671
DWARFExpressionList m_frame_base;

‎lldb/source/API/SBBlock.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ bool SBBlock::GetDescription(SBStream &description) {
176176
m_opaque_ptr->CalculateSymbolContext(&sc);
177177
if (sc.function) {
178178
m_opaque_ptr->DumpAddressRanges(
179-
&strm,
180-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress());
179+
&strm, sc.function->GetAddress().GetFileAddress());
181180
}
182181
} else
183182
strm.PutCString("No value");

‎lldb/source/API/SBFunction.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ SBInstructionList SBFunction::GetInstructions(SBTarget target,
120120
if (m_opaque_ptr) {
121121
TargetSP target_sp(target.GetSP());
122122
std::unique_lock<std::recursive_mutex> lock;
123-
ModuleSP module_sp(
124-
m_opaque_ptr->GetAddressRange().GetBaseAddress().GetModule());
123+
ModuleSP module_sp(m_opaque_ptr->GetAddress().GetModule());
125124
if (target_sp && module_sp) {
126125
lock = std::unique_lock<std::recursive_mutex>(target_sp->GetAPIMutex());
127126
const bool force_live_memory = true;

‎lldb/source/Breakpoint/BreakpointResolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ void BreakpointResolver::AddLocation(SearchFilter &filter,
325325
// If the line number is before the prologue end, move it there...
326326
bool skipped_prologue = false;
327327
if (skip_prologue && sc.function) {
328-
Address prologue_addr(sc.function->GetAddressRange().GetBaseAddress());
328+
Address prologue_addr = sc.function->GetAddress();
329329
if (prologue_addr.IsValid() && (line_start == prologue_addr)) {
330330
const uint32_t prologue_byte_size = sc.function->GetPrologueByteSize();
331331
if (prologue_byte_size) {

‎lldb/source/Breakpoint/BreakpointResolverName.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ BreakpointResolverName::SearchCallback(SearchFilter &filter,
339339
if (!sc.block->GetStartAddress(break_addr))
340340
break_addr.Clear();
341341
} else if (sc.function) {
342-
break_addr = sc.function->GetAddressRange().GetBaseAddress();
342+
break_addr = sc.function->GetAddress();
343343
if (m_skip_prologue && break_addr.IsValid()) {
344344
const uint32_t prologue_byte_size = sc.function->GetPrologueByteSize();
345345
if (prologue_byte_size)

‎lldb/source/Core/SearchFilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ bool SearchFilter::FunctionPasses(Function &function) {
152152
// This is a slightly cheesy job, but since we don't have finer grained
153153
// filters yet, just checking that the start address passes is probably
154154
// good enough for the base class behavior.
155-
Address addr = function.GetAddressRange().GetBaseAddress();
155+
Address addr = function.GetAddress();
156156
return AddressPasses(addr);
157157
}
158158

‎lldb/source/Expression/DWARFExpressionList.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ bool DWARFExpressionList::MatchesOperand(
126126
if (!sc.function)
127127
return false;
128128

129-
addr_t load_function_start =
130-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress();
129+
addr_t load_function_start = sc.function->GetAddress().GetFileAddress();
131130
if (load_function_start == LLDB_INVALID_ADDRESS)
132131
return false;
133132

‎lldb/source/Expression/IRExecutionUnit.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,7 @@ class LoadAddressResolver {
731731

732732
// If that didn't work, try the function.
733733
if (load_address == LLDB_INVALID_ADDRESS && candidate_sc.function) {
734-
Address addr =
735-
candidate_sc.function->GetAddressRange().GetBaseAddress();
734+
Address addr = candidate_sc.function->GetAddress();
736735
load_address = m_target->GetProcessSP() ? addr.GetLoadAddress(m_target)
737736
: addr.GetFileAddress();
738737
}

‎lldb/source/Plugins/Architecture/Mips/ArchitectureMips.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ lldb::addr_t ArchitectureMips::GetBreakableLoadAddress(lldb::addr_t addr,
9797
resolve_scope, sc);
9898
Address sym_addr;
9999
if (sc.function)
100-
sym_addr = sc.function->GetAddressRange().GetBaseAddress();
100+
sym_addr = sc.function->GetAddress();
101101
else if (sc.symbol)
102102
sym_addr = sc.symbol->GetAddress();
103103

‎lldb/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwin.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,8 @@ bool DynamicLoaderDarwin::AlwaysRelyOnEHUnwindInfo(SymbolContext &sym_ctx) {
796796
if (sym_ctx.symbol) {
797797
module_sp = sym_ctx.symbol->GetAddressRef().GetModule();
798798
}
799-
if (module_sp.get() == nullptr && sym_ctx.function) {
800-
module_sp =
801-
sym_ctx.function->GetAddressRange().GetBaseAddress().GetModule();
802-
}
799+
if (module_sp.get() == nullptr && sym_ctx.function)
800+
module_sp = sym_ctx.function->GetAddress().GetModule();
803801
if (module_sp.get() == nullptr)
804802
return false;
805803

‎lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,8 +856,7 @@ bool DynamicLoaderPOSIXDYLD::AlwaysRelyOnEHUnwindInfo(
856856
if (sym_ctx.symbol)
857857
module_sp = sym_ctx.symbol->GetAddressRef().GetModule();
858858
if (!module_sp && sym_ctx.function)
859-
module_sp =
860-
sym_ctx.function->GetAddressRange().GetBaseAddress().GetModule();
859+
module_sp = sym_ctx.function->GetAddress().GetModule();
861860
if (!module_sp)
862861
return false;
863862

‎lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1883,7 +1883,7 @@ void ClangExpressionDeclMap::AddOneFunction(NameSearchContext &context,
18831883
return;
18841884
}
18851885

1886-
fun_address = function->GetAddressRange().GetBaseAddress();
1886+
fun_address = function->GetAddress();
18871887

18881888
CompilerType copied_function_type = GuardedCopyType(function_clang_type);
18891889
if (copied_function_type) {

‎lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ size_t SymbolFileBreakpad::ParseBlocksRecursive(Function &func) {
302302
blocks.push_back(&func.GetBlock(false));
303303

304304
size_t blocks_added = 0;
305-
addr_t func_base = func.GetAddressRange().GetBaseAddress().GetOffset();
305+
addr_t func_base = func.GetAddress().GetOffset();
306306
CompUnitData &data = m_cu_data->GetEntryRef(comp_unit->GetID()).data;
307307
LineIterator It(*m_objfile_sp, Record::Func, data.bookmark),
308308
End(*m_objfile_sp);
@@ -396,7 +396,7 @@ SymbolFileBreakpad::ResolveSymbolContext(const Address &so_addr,
396396
Block &block = func_sp->GetBlock(true);
397397
sc.block = block.FindInnermostBlockByOffset(
398398
so_addr.GetFileAddress() -
399-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress());
399+
sc.function->GetAddress().GetFileAddress());
400400
if (sc.block)
401401
result |= eSymbolContextBlock;
402402
}

‎lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,8 +1061,7 @@ static void RemoveFunctionsWithModuleNotEqualTo(const ModuleSP &module_sp,
10611061
SymbolContext sc;
10621062
sc_list.GetContextAtIndex(i, sc);
10631063
if (sc.function) {
1064-
const SectionSP section_sp(
1065-
sc.function->GetAddressRange().GetBaseAddress().GetSection());
1064+
const SectionSP section_sp = sc.function->GetAddress().GetSection();
10661065
if (section_sp->GetModule() != module_sp) {
10671066
sc_list.RemoveContextAtIndex(i);
10681067
continue;

‎lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,7 @@ Block *SymbolFileNativePDB::CreateBlock(PdbCompilandSymId block_id) {
416416
lldbassert(func);
417417
lldb::addr_t block_base =
418418
m_index->MakeVirtualAddress(block.Segment, block.CodeOffset);
419-
lldb::addr_t func_base =
420-
func->GetAddressRange().GetBaseAddress().GetFileAddress();
419+
lldb::addr_t func_base = func->GetAddress().GetFileAddress();
421420
BlockSP child_block = parent_block->CreateChild(opaque_block_uid);
422421
if (block_base >= func_base)
423422
child_block->AddRange(Block::Range(block_base - func_base, block.CodeSize));
@@ -1113,8 +1112,7 @@ uint32_t SymbolFileNativePDB::ResolveSymbolContext(
11131112
sc.function = GetOrCreateFunction(csid, *sc.comp_unit).get();
11141113
if (sc.function) {
11151114
Block &block = sc.function->GetBlock(true);
1116-
addr_t func_base =
1117-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress();
1115+
addr_t func_base = sc.function->GetAddress().GetFileAddress();
11181116
addr_t offset = file_addr - func_base;
11191117
sc.block = block.FindInnermostBlockByOffset(offset);
11201118
}
@@ -1127,8 +1125,7 @@ uint32_t SymbolFileNativePDB::ResolveSymbolContext(
11271125
sc.function = block->CalculateSymbolContextFunction();
11281126
if (sc.function) {
11291127
sc.function->GetBlock(true);
1130-
addr_t func_base =
1131-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress();
1128+
addr_t func_base = sc.function->GetAddress().GetFileAddress();
11321129
addr_t offset = file_addr - func_base;
11331130
sc.block = block->FindInnermostBlockByOffset(offset);
11341131
}
@@ -1857,8 +1854,7 @@ VariableSP SymbolFileNativePDB::CreateLocalVariable(PdbCompilandSymId scope_id,
18571854
// when lookuping local variables in this scope.
18581855
if (!var_info.location.IsValid())
18591856
var_info.location = DWARFExpressionList(module, DWARFExpression(), nullptr);
1860-
var_info.location.SetFuncFileAddress(
1861-
func->GetAddressRange().GetBaseAddress().GetFileAddress());
1857+
var_info.location.SetFuncFileAddress(func->GetAddress().GetFileAddress());
18621858
CompilandIndexItem *cii = m_index->compilands().GetCompiland(var_id.modi);
18631859
CompUnitSP comp_unit_sp = GetOrCreateCompileUnit(*cii);
18641860
TypeSP type_sp = GetOrCreateType(var_info.type);

‎lldb/source/Symbol/Block.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ void Block::GetDescription(Stream *s, Function *function,
3939

4040
addr_t base_addr = LLDB_INVALID_ADDRESS;
4141
if (target)
42-
base_addr =
43-
function->GetAddressRange().GetBaseAddress().GetLoadAddress(target);
42+
base_addr = function->GetAddress().GetLoadAddress(target);
4443
if (base_addr == LLDB_INVALID_ADDRESS)
45-
base_addr = function->GetAddressRange().GetBaseAddress().GetFileAddress();
44+
base_addr = function->GetAddress().GetFileAddress();
4645

4746
s->Printf(", range%s = ", num_ranges > 1 ? "s" : "");
4847
for (size_t i = 0; i < num_ranges; ++i) {
@@ -299,7 +298,7 @@ bool Block::GetRangeAtIndex(uint32_t range_idx, AddressRange &range) {
299298
Function *function = CalculateSymbolContextFunction();
300299
if (function) {
301300
const Range &vm_range = m_ranges.GetEntryRef(range_idx);
302-
range.GetBaseAddress() = function->GetAddressRange().GetBaseAddress();
301+
range.GetBaseAddress() = function->GetAddress();
303302
range.GetBaseAddress().Slide(vm_range.GetRangeBase());
304303
range.SetByteSize(vm_range.GetByteSize());
305304
return true;
@@ -317,7 +316,7 @@ AddressRanges Block::GetRanges() {
317316
ranges.emplace_back();
318317
auto &range = ranges.back();
319318
const Range &vm_range = m_ranges.GetEntryRef(i);
320-
range.GetBaseAddress() = function->GetAddressRange().GetBaseAddress();
319+
range.GetBaseAddress() = function->GetAddress();
321320
range.GetBaseAddress().Slide(vm_range.GetRangeBase());
322321
range.SetByteSize(vm_range.GetByteSize());
323322
}
@@ -330,7 +329,7 @@ bool Block::GetStartAddress(Address &addr) {
330329

331330
Function *function = CalculateSymbolContextFunction();
332331
if (function) {
333-
addr = function->GetAddressRange().GetBaseAddress();
332+
addr = function->GetAddress();
334333
addr.Slide(m_ranges.GetEntryRef(0).GetRangeBase());
335334
return true;
336335
}
@@ -349,8 +348,7 @@ void Block::AddRange(const Range &range) {
349348
if (log) {
350349
ModuleSP module_sp(m_parent_scope.CalculateSymbolContextModule());
351350
Function *function = m_parent_scope.CalculateSymbolContextFunction();
352-
const addr_t function_file_addr =
353-
function->GetAddressRange().GetBaseAddress().GetFileAddress();
351+
const addr_t function_file_addr = function->GetAddress().GetFileAddress();
354352
const addr_t block_start_addr = function_file_addr + range.GetRangeBase();
355353
const addr_t block_end_addr = function_file_addr + range.GetRangeEnd();
356354
Type *func_type = function->GetType();

‎lldb/source/Symbol/Function.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ lldb::addr_t CallEdge::GetLoadAddress(lldb::addr_t unresolved_pc,
133133
Function &caller, Target &target) {
134134
Log *log = GetLog(LLDBLog::Step);
135135

136-
const Address &caller_start_addr = caller.GetAddressRange().GetBaseAddress();
136+
const Address &caller_start_addr = caller.GetAddress();
137137

138138
ModuleSP caller_module_sp = caller_start_addr.GetModule();
139139
if (!caller_module_sp) {
@@ -279,9 +279,10 @@ Function::Function(CompileUnit *comp_unit, lldb::user_id_t func_uid,
279279
AddressRanges ranges)
280280
: UserID(func_uid), m_comp_unit(comp_unit), m_type_uid(type_uid),
281281
m_type(type), m_mangled(mangled), m_block(*this, func_uid),
282-
m_range(CollapseRanges(ranges)), m_prologue_byte_size(0) {
282+
m_range(CollapseRanges(ranges)), m_address(m_range.GetBaseAddress()),
283+
m_prologue_byte_size(0) {
283284
assert(comp_unit != nullptr);
284-
lldb::addr_t base_file_addr = m_range.GetBaseAddress().GetFileAddress();
285+
lldb::addr_t base_file_addr = m_address.GetFileAddress();
285286
for (const AddressRange &range : ranges)
286287
m_block.AddRange(
287288
Block::Range(range.GetBaseAddress().GetFileAddress() - base_file_addr,
@@ -312,8 +313,7 @@ void Function::GetStartLineSourceInfo(SupportFileSP &source_file_sp,
312313
return;
313314

314315
LineEntry line_entry;
315-
if (line_table->FindLineEntryByAddress(GetAddressRange().GetBaseAddress(),
316-
line_entry, nullptr)) {
316+
if (line_table->FindLineEntryByAddress(GetAddress(), line_entry, nullptr)) {
317317
line_no = line_entry.line;
318318
source_file_sp = line_entry.file_sp;
319319
}
@@ -484,7 +484,7 @@ Function *Function::CalculateSymbolContextFunction() { return this; }
484484
lldb::DisassemblerSP Function::GetInstructions(const ExecutionContext &exe_ctx,
485485
const char *flavor,
486486
bool prefer_file_cache) {
487-
ModuleSP module_sp(GetAddressRange().GetBaseAddress().GetModule());
487+
ModuleSP module_sp = GetAddress().GetModule();
488488
if (module_sp && exe_ctx.HasTargetScope()) {
489489
return Disassembler::DisassembleRange(
490490
module_sp->GetArchitecture(), nullptr, nullptr, nullptr, flavor,
@@ -601,8 +601,7 @@ uint32_t Function::GetPrologueByteSize() {
601601
if (line_table) {
602602
LineEntry first_line_entry;
603603
uint32_t first_line_entry_idx = UINT32_MAX;
604-
if (line_table->FindLineEntryByAddress(GetAddressRange().GetBaseAddress(),
605-
first_line_entry,
604+
if (line_table->FindLineEntryByAddress(GetAddress(), first_line_entry,
606605
&first_line_entry_idx)) {
607606
// Make sure the first line entry isn't already the end of the prologue
608607
addr_t prologue_end_file_addr = LLDB_INVALID_ADDRESS;

‎lldb/source/Symbol/SymbolContext.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ bool SymbolContext::DumpStopContext(
105105
if (addr_t file_addr = addr.GetFileAddress();
106106
file_addr != LLDB_INVALID_ADDRESS) {
107107
const addr_t function_offset =
108-
file_addr -
109-
function->GetAddressRange().GetBaseAddress().GetFileAddress();
108+
file_addr - function->GetAddress().GetFileAddress();
110109
if (!show_function_name) {
111110
// Print +offset even if offset is 0
112111
dumped_something = true;
@@ -700,9 +699,7 @@ LineEntry SymbolContext::GetFunctionStartLineEntry() const {
700699
}
701700

702701
if (function) {
703-
if (function->GetAddressRange()
704-
.GetBaseAddress()
705-
.CalculateSymbolContextLineEntry(line_entry))
702+
if (function->GetAddress().CalculateSymbolContextLineEntry(line_entry))
706703
return line_entry;
707704
}
708705
return LineEntry();
@@ -1228,8 +1225,7 @@ bool SymbolContextList::AppendIfUnique(const SymbolContext &sc,
12281225
continue;
12291226

12301227
if (pos->function) {
1231-
if (pos->function->GetAddressRange().GetBaseAddress() ==
1232-
sc.symbol->GetAddressRef()) {
1228+
if (pos->function->GetAddress() == sc.symbol->GetAddressRef()) {
12331229
// Do we already have a function with this symbol?
12341230
if (pos->symbol == sc.symbol)
12351231
return false;

‎lldb/source/Symbol/Variable.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,7 @@ bool Variable::LocationIsValidForFrame(StackFrame *frame) {
221221
TargetSP target_sp(frame->CalculateTarget());
222222

223223
addr_t loclist_base_load_addr =
224-
function->GetAddressRange().GetBaseAddress().GetLoadAddress(
225-
target_sp.get());
224+
function->GetAddress().GetLoadAddress(target_sp.get());
226225
if (loclist_base_load_addr == LLDB_INVALID_ADDRESS)
227226
return false;
228227
// It is a location list. We just need to tell if the location list
@@ -259,7 +258,7 @@ bool Variable::LocationIsValidForAddress(const Address &address) {
259258

260259
if (sc.function) {
261260
addr_t loclist_base_file_addr =
262-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress();
261+
sc.function->GetAddress().GetFileAddress();
263262
if (loclist_base_file_addr == LLDB_INVALID_ADDRESS)
264263
return false;
265264
// It is a location list. We just need to tell if the location list
@@ -450,8 +449,7 @@ bool Variable::DumpLocations(Stream *s, const Address &address) {
450449

451450
const addr_t file_addr = address.GetFileAddress();
452451
if (sc.function) {
453-
addr_t loclist_base_file_addr =
454-
sc.function->GetAddressRange().GetBaseAddress().GetFileAddress();
452+
addr_t loclist_base_file_addr = sc.function->GetAddress().GetFileAddress();
455453
if (loclist_base_file_addr == LLDB_INVALID_ADDRESS)
456454
return false;
457455
return m_location_list.DumpLocations(s, eDescriptionLevelBrief,

‎lldb/source/Target/StackFrame.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,7 @@ llvm::Error StackFrame::GetFrameBaseValue(Scalar &frame_base) {
11211121
addr_t loclist_base_addr = LLDB_INVALID_ADDRESS;
11221122
if (!m_sc.function->GetFrameBaseExpression().IsAlwaysValidSingleExpr())
11231123
loclist_base_addr =
1124-
m_sc.function->GetAddressRange().GetBaseAddress().GetLoadAddress(
1125-
exe_ctx.GetTargetPtr());
1124+
m_sc.function->GetAddress().GetLoadAddress(exe_ctx.GetTargetPtr());
11261125

11271126
llvm::Expected<Value> expr_value =
11281127
m_sc.function->GetFrameBaseExpression().Evaluate(

‎lldb/source/Target/ThreadPlanStepInRange.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ bool ThreadPlanStepInRange::ShouldStop(Event *event_ptr) {
250250
eSymbolContextSymbol);
251251

252252
if (sc.function) {
253-
func_start_address = sc.function->GetAddressRange().GetBaseAddress();
253+
func_start_address = sc.function->GetAddress();
254254
if (curr_addr == func_start_address.GetLoadAddress(&GetTarget()))
255255
bytes_to_skip = sc.function->GetPrologueByteSize();
256256
} else if (sc.symbol) {

‎lldb/source/ValueObject/ValueObjectVariable.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ bool ValueObjectVariable::UpdateValue() {
160160
variable->CalculateSymbolContext(&sc);
161161
if (sc.function)
162162
loclist_base_load_addr =
163-
sc.function->GetAddressRange().GetBaseAddress().GetLoadAddress(
164-
target);
163+
sc.function->GetAddress().GetLoadAddress(target);
165164
}
166165
Value old_value(m_value);
167166
llvm::Expected<Value> maybe_value = expr_list.Evaluate(

0 commit comments

Comments
 (0)