Skip to content

Cherry-picks slide fix #9524

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 2 commits into from
Nov 7, 2024
+10 −10
Merged

Cherry-picks slide fix #9524

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fff2b06
[lldb] Fix slide calculation in LLDBMemoryReader
augusto2112 Jul 23, 2024
cf9acce
[NFC] Replace "auto" with type identifiers in LLDBMemoryReader
augusto2112 Jul 24, 2024
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
20 changes: 10 additions & 10 deletions lldb/source/Plugins/LanguageRuntime/Swift/LLDBMemoryReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,22 +639,22 @@ LLDBMemoryReader::resolveRemoteAddress(uint64_t address) const {
file_address, object_file->GetFileSpec().GetFilename());
return {};
}
auto sec = sec_list->GetSectionAtIndex(0);
auto sec_file_address = sec->GetFileAddress();
auto sec_load_address = sec->GetLoadBaseAddress(&m_process.GetTarget());
SectionSP sec = sec_list->GetSectionAtIndex(0);
addr_t sec_file_address = sec->GetFileAddress();
addr_t sec_load_address = sec->GetLoadBaseAddress(&m_process.GetTarget());

bool overflow = false;
auto slide =
llvm::SaturatingAdd(sec_load_address, -sec_file_address, &overflow);
if (overflow) {
if (sec_load_address < sec_file_address) {
LLDB_LOG(log,
"[MemoryReader] section load address {0:x} - file address {1:x} "
"overflows",
"[MemoryReader] section load address {0:x} is smaller than "
"section file address {1:x}",
sec_load_address, sec_file_address);
return {};
}

auto virtual_address = llvm::SaturatingAdd(file_address, slide, &overflow);
addr_t slide = sec_load_address - sec_file_address;

bool overflow = false;
addr_t virtual_address = llvm::SaturatingAdd(file_address, slide, &overflow);
if (overflow) {
LLDB_LOG(log, "[MemoryReader] file address {0:x} + slide {1:x} overflows",
sec_load_address, sec_file_address);
Expand Down