Skip to content

[lldb] Don't clear a Module's UnwindTable when adding a SymbolFile #86603

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
Mar 26, 2024
Merged

[lldb] Don't clear a Module's UnwindTable when adding a SymbolFile #86603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6fcac7
[lldb] Don't clear a Module's UnwindTable when adding a SymbolFile
jasonmolenda Mar 25, 2024
78768f0
Merge branch 'main' into dont-reset-unwindtable-on-adding-symbol-file
jasonmolenda Mar 26, 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
7 changes: 1 addition & 6 deletions lldb/source/Core/Module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,9 +1239,9 @@ void Module::SectionFileAddressesChanged() {

UnwindTable &Module::GetUnwindTable() {
if (!m_unwind_table) {
m_unwind_table.emplace(*this);
if (!m_symfile_spec)
SymbolLocator::DownloadSymbolFileAsync(GetUUID());
m_unwind_table.emplace(*this);
}
return *m_unwind_table;
}
Expand Down Expand Up @@ -1359,15 +1359,10 @@ void Module::SetSymbolFileFileSpec(const FileSpec &file) {
// one
obj_file->ClearSymtab();

// Clear the unwind table too, as that may also be affected by the
// symbol file information.
m_unwind_table.reset();

// The symbol file might be a directory bundle ("/tmp/a.out.dSYM")
// instead of a full path to the symbol file within the bundle
// ("/tmp/a.out.dSYM/Contents/Resources/DWARF/a.out"). So we need to
// check this

if (FileSystem::Instance().IsDirectory(file)) {
std::string new_path(file.GetPath());
std::string old_path(obj_file->GetFileSpec().GetPath());
Expand Down