Skip to content

[lldb][Expression][NFC] Make LoadAddressResolver::m_target a reference #149490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2025
Merged

[lldb][Expression][NFC] Make LoadAddressResolver::m_target a reference #149490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lldb/source/Expression/IRExecutionUnit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ void IRExecutionUnit::CollectCandidateCPlusPlusNames(

class LoadAddressResolver {
public:
LoadAddressResolver(Target *target, bool &symbol_was_missing_weak)
LoadAddressResolver(Target &target, bool &symbol_was_missing_weak)
: m_target(target), m_symbol_was_missing_weak(symbol_was_missing_weak) {}

std::optional<lldb::addr_t> Resolve(SymbolContextList &sc_list) {
Expand All @@ -722,20 +722,20 @@ class LoadAddressResolver {

// First try the symbol.
if (candidate_sc.symbol) {
load_address = candidate_sc.symbol->ResolveCallableAddress(*m_target);
load_address = candidate_sc.symbol->ResolveCallableAddress(m_target);
if (load_address == LLDB_INVALID_ADDRESS) {
Address addr = candidate_sc.symbol->GetAddress();
load_address = m_target->GetProcessSP()
? addr.GetLoadAddress(m_target)
load_address = m_target.GetProcessSP()
? addr.GetLoadAddress(&m_target)
: addr.GetFileAddress();
}
}

// If that didn't work, try the function.
if (load_address == LLDB_INVALID_ADDRESS && candidate_sc.function) {
Address addr = candidate_sc.function->GetAddress();
load_address = m_target->GetProcessSP() ? addr.GetLoadAddress(m_target)
: addr.GetFileAddress();
load_address = m_target.GetProcessSP() ? addr.GetLoadAddress(&m_target)
: addr.GetFileAddress();
}

// We found a load address.
Expand Down Expand Up @@ -766,7 +766,7 @@ class LoadAddressResolver {
}

private:
Target *m_target;
Target &m_target;
bool &m_symbol_was_missing_weak;
lldb::addr_t m_best_internal_load_address = LLDB_INVALID_ADDRESS;
};
Expand All @@ -790,7 +790,7 @@ IRExecutionUnit::FindInSymbols(const std::vector<ConstString> &names,
for (size_t i = 0; i < m_preferred_modules.GetSize(); ++i)
non_local_images.Remove(m_preferred_modules.GetModuleAtIndex(i));

LoadAddressResolver resolver(target, symbol_was_missing_weak);
LoadAddressResolver resolver(*target, symbol_was_missing_weak);

ModuleFunctionSearchOptions function_options;
function_options.include_symbols = true;
Expand Down
Loading