Skip to content

[lldb][swift] Call FixCodeAddress on code addresses read from memory #10384

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
Mar 31, 2025
Merged

[lldb][swift] Call FixCodeAddress on code addresses read from memory #10384

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
19 changes: 13 additions & 6 deletions lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2807,10 +2807,12 @@ std::optional<lldb::addr_t> SwiftLanguageRuntime::TrySkipVirtualParentProlog(
// Get the PC of the parent frame, i.e. the continuation pointer, which is
// the second field of the CFA.
addr_t pc_location = cfa + ptr_size;
addr_t pc_value = LLDB_INVALID_ADDRESS;
process.ReadMemory(pc_location, &pc_value, ptr_size, error);
addr_t pc_value = process.ReadPointerFromMemory(pc_location, error);
if (error.Fail())
return {};
// Clear any high order bits of this code address so that SetLoadAddress works
// properly.
pc_value = process.FixCodeAddress(pc_value);

Address pc;
Target &target = process.GetTarget();
Expand All @@ -2819,11 +2821,16 @@ std::optional<lldb::addr_t> SwiftLanguageRuntime::TrySkipVirtualParentProlog(
return {};

SymbolContext sc;
if (!pc.CalculateSymbolContext(&sc,
eSymbolContextFunction | eSymbolContextSymbol))
return {};
if (!sc.symbol && !sc.function)
bool sc_ok = pc.CalculateSymbolContext(&sc, eSymbolContextFunction |
eSymbolContextSymbol);
if (!sc_ok || (!sc.symbol && !sc.function)) {
Log *log = GetLog(LLDBLog::Unwind);
LLDB_LOGF(log,
"SwiftLanguageRuntime::%s Failed to find a symbol context for "
"address 0x%" PRIx64,
__FUNCTION__, pc_value);
return {};
}

auto prologue_size = sc.symbol ? sc.symbol->GetPrologueByteSize()
: sc.function->GetPrologueByteSize();
Expand Down