Skip to content

[lldb/DWARF] Cache negative results of variable parsing #108810

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

Closed
wants to merge 1 commit into from
Closed

[lldb/DWARF] Cache negative results of variable parsing #108810

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
26 changes: 12 additions & 14 deletions lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3377,16 +3377,13 @@ VariableSP SymbolFileDWARF::ParseVariableDIECached(const SymbolContext &sc,

DIEToVariableSP &die_to_variable = die.GetDWARF()->GetDIEToVariable();

VariableSP var_sp = die_to_variable[die.GetDIE()];
if (var_sp)
return var_sp;

var_sp = ParseVariableDIE(sc, die, LLDB_INVALID_ADDRESS);
if (var_sp) {
die_to_variable[die.GetDIE()] = var_sp;
if (DWARFDIE spec_die = die.GetReferencedDIE(DW_AT_specification))
die_to_variable[spec_die.GetDIE()] = var_sp;
}
if (auto it = die_to_variable.find(die.GetDIE()); it != die_to_variable.end())
return it->second;

VariableSP var_sp = ParseVariableDIE(sc, die, LLDB_INVALID_ADDRESS);
die_to_variable.insert_or_assign(die.GetDIE(), var_sp);
if (DWARFDIE spec_die = die.GetReferencedDIE(DW_AT_specification))
die_to_variable.insert_or_assign(spec_die.GetDIE(), var_sp);
return var_sp;
}

Expand Down Expand Up @@ -3799,9 +3796,10 @@ void SymbolFileDWARF::ParseAndAppendGlobalVariable(
return;

// Check to see if we have already parsed this variable or constant?
VariableSP var_sp = GetDIEToVariable()[die.GetDIE()];
if (var_sp) {
cc_variable_list.AddVariableIfUnique(var_sp);
DIEToVariableSP &die_to_variable = GetDIEToVariable();
if (auto it = die_to_variable.find(die.GetDIE());
it != die_to_variable.end()) {
cc_variable_list.AddVariableIfUnique(it->second);
return;
}

Expand Down Expand Up @@ -3835,7 +3833,7 @@ void SymbolFileDWARF::ParseAndAppendGlobalVariable(
return;
}

var_sp = ParseVariableDIECached(sc, die);
VariableSP var_sp = ParseVariableDIECached(sc, die);
if (!var_sp)
return;

Expand Down
Loading