wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect include_inlines when looking up functions in SymbolFileDWARF 

Summary:
SymbolFileDWARF was not respecting the include_inlines argument in function lookup in all code
paths. This resulted in an attempt to call an inlined function during expression evaluation,
which is impossible, and usually resulted in a segfault in the inferior. This patch makes sure
include_inlines is respected in all code paths.

Reviewers: clayborg

Subscribers: lldb-commits, sivachandra

Differential Revision: http://reviews.llvm.org/D8286

llvm-svn: 232151
This commit is contained in:
Pavel Labath 2015-03-13 10:22:00 +00:00
parent 1253a81096
commit a73d657e36
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View File

@ -3455,16 +3455,18 @@ SymbolFileDWARF::FindGlobalVariables(const RegularExpression& regex, bool append
bool bool
SymbolFileDWARF::ResolveFunction (dw_offset_t die_offset, SymbolFileDWARF::ResolveFunction (dw_offset_t die_offset,
DWARFCompileUnit *&dwarf_cu, DWARFCompileUnit *&dwarf_cu,
bool include_inlines,
SymbolContextList& sc_list) SymbolContextList& sc_list)
{ {
const DWARFDebugInfoEntry *die = DebugInfo()->GetDIEPtrWithCompileUnitHint (die_offset, &dwarf_cu); const DWARFDebugInfoEntry *die = DebugInfo()->GetDIEPtrWithCompileUnitHint (die_offset, &dwarf_cu);
return ResolveFunction (dwarf_cu, die, sc_list); return ResolveFunction (dwarf_cu, die, include_inlines, sc_list);
} }
bool bool
SymbolFileDWARF::ResolveFunction (DWARFCompileUnit *cu, SymbolFileDWARF::ResolveFunction (DWARFCompileUnit *cu,
const DWARFDebugInfoEntry *die, const DWARFDebugInfoEntry *die,
bool include_inlines,
SymbolContextList& sc_list) SymbolContextList& sc_list)
{ {
SymbolContext sc; SymbolContext sc;
@ -3473,7 +3475,7 @@ SymbolFileDWARF::ResolveFunction (DWARFCompileUnit *cu,
return false; return false;
// If we were passed a die that is not a function, just return false... // If we were passed a die that is not a function, just return false...
if (die->Tag() != DW_TAG_subprogram && die->Tag() != DW_TAG_inlined_subroutine) if (! (die->Tag() == DW_TAG_subprogram || (include_inlines && die->Tag() == DW_TAG_inlined_subroutine)))
return false; return false;
const DWARFDebugInfoEntry* inlined_die = NULL; const DWARFDebugInfoEntry* inlined_die = NULL;
@ -3520,12 +3522,13 @@ SymbolFileDWARF::ResolveFunction (DWARFCompileUnit *cu,
void void
SymbolFileDWARF::FindFunctions (const ConstString &name, SymbolFileDWARF::FindFunctions (const ConstString &name,
const NameToDIE &name_to_die, const NameToDIE &name_to_die,
bool include_inlines,
SymbolContextList& sc_list) SymbolContextList& sc_list)
{ {
DIEArray die_offsets; DIEArray die_offsets;
if (name_to_die.Find (name, die_offsets)) if (name_to_die.Find (name, die_offsets))
{ {
ParseFunctions (die_offsets, sc_list); ParseFunctions (die_offsets, include_inlines, sc_list);
} }
} }
@ -3533,12 +3536,13 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
void void
SymbolFileDWARF::FindFunctions (const RegularExpression &regex, SymbolFileDWARF::FindFunctions (const RegularExpression &regex,
const NameToDIE &name_to_die, const NameToDIE &name_to_die,
bool include_inlines,
SymbolContextList& sc_list) SymbolContextList& sc_list)
{ {
DIEArray die_offsets; DIEArray die_offsets;
if (name_to_die.Find (regex, die_offsets)) if (name_to_die.Find (regex, die_offsets))
{ {
ParseFunctions (die_offsets, sc_list); ParseFunctions (die_offsets, include_inlines, sc_list);
} }
} }
@ -3546,6 +3550,7 @@ SymbolFileDWARF::FindFunctions (const RegularExpression &regex,
void void
SymbolFileDWARF::FindFunctions (const RegularExpression &regex, SymbolFileDWARF::FindFunctions (const RegularExpression &regex,
const DWARFMappedHash::MemoryTable &memory_table, const DWARFMappedHash::MemoryTable &memory_table,
bool include_inlines,
SymbolContextList& sc_list) SymbolContextList& sc_list)
{ {
DIEArray die_offsets; DIEArray die_offsets;
@ -3553,12 +3558,13 @@ SymbolFileDWARF::FindFunctions (const RegularExpression &regex,
if (memory_table.AppendAllDIEsThatMatchingRegex (regex, hash_data_array)) if (memory_table.AppendAllDIEsThatMatchingRegex (regex, hash_data_array))
{ {
DWARFMappedHash::ExtractDIEArray (hash_data_array, die_offsets); DWARFMappedHash::ExtractDIEArray (hash_data_array, die_offsets);
ParseFunctions (die_offsets, sc_list); ParseFunctions (die_offsets, include_inlines, sc_list);
} }
} }
void void
SymbolFileDWARF::ParseFunctions (const DIEArray &die_offsets, SymbolFileDWARF::ParseFunctions (const DIEArray &die_offsets,
bool include_inlines,
SymbolContextList& sc_list) SymbolContextList& sc_list)
{ {
const size_t num_matches = die_offsets.size(); const size_t num_matches = die_offsets.size();
@ -3568,7 +3574,7 @@ SymbolFileDWARF::ParseFunctions (const DIEArray &die_offsets,
for (size_t i=0; i<num_matches; ++i) for (size_t i=0; i<num_matches; ++i)
{ {
const dw_offset_t die_offset = die_offsets[i]; const dw_offset_t die_offset = die_offsets[i];
ResolveFunction (die_offset, dwarf_cu, sc_list); ResolveFunction (die_offset, dwarf_cu, include_inlines, sc_list);
} }
} }
} }
@ -3759,12 +3765,9 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
if (namespace_decl && !DIEIsInNamespace (namespace_decl, dwarf_cu, die)) if (namespace_decl && !DIEIsInNamespace (namespace_decl, dwarf_cu, die))
continue; continue;
if (!include_inlines && die->Tag() == DW_TAG_inlined_subroutine)
continue;
if (resolved_dies.find(die) == resolved_dies.end()) if (resolved_dies.find(die) == resolved_dies.end())
{ {
if (ResolveFunction (dwarf_cu, die, sc_list)) if (ResolveFunction (dwarf_cu, die, include_inlines, sc_list))
resolved_dies.insert(die); resolved_dies.insert(die);
} }
} }
@ -3794,12 +3797,9 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
const char *die_name = die->GetName(this, dwarf_cu); const char *die_name = die->GetName(this, dwarf_cu);
if (ObjCLanguageRuntime::IsPossibleObjCMethodName(die_name)) if (ObjCLanguageRuntime::IsPossibleObjCMethodName(die_name))
{ {
if (!include_inlines && die->Tag() == DW_TAG_inlined_subroutine)
continue;
if (resolved_dies.find(die) == resolved_dies.end()) if (resolved_dies.find(die) == resolved_dies.end())
{ {
if (ResolveFunction (dwarf_cu, die, sc_list)) if (ResolveFunction (dwarf_cu, die, include_inlines, sc_list))
resolved_dies.insert(die); resolved_dies.insert(die);
} }
} }
@ -3828,15 +3828,12 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
const DWARFDebugInfoEntry* die = info->GetDIEPtrWithCompileUnitHint (die_offset, &dwarf_cu); const DWARFDebugInfoEntry* die = info->GetDIEPtrWithCompileUnitHint (die_offset, &dwarf_cu);
if (die) if (die)
{ {
if (!include_inlines && die->Tag() == DW_TAG_inlined_subroutine)
continue;
if (namespace_decl && !DIEIsInNamespace (namespace_decl, dwarf_cu, die)) if (namespace_decl && !DIEIsInNamespace (namespace_decl, dwarf_cu, die))
continue; continue;
// If we get to here, the die is good, and we should add it: // If we get to here, the die is good, and we should add it:
if (resolved_dies.find(die) == resolved_dies.end()) if (resolved_dies.find(die) == resolved_dies.end())
if (ResolveFunction (dwarf_cu, die, sc_list)) if (ResolveFunction (dwarf_cu, die, include_inlines, sc_list))
{ {
bool keep_die = true; bool keep_die = true;
if ((name_type_mask & (eFunctionNameTypeBase|eFunctionNameTypeMethod)) != (eFunctionNameTypeBase|eFunctionNameTypeMethod)) if ((name_type_mask & (eFunctionNameTypeBase|eFunctionNameTypeMethod)) != (eFunctionNameTypeBase|eFunctionNameTypeMethod))
@ -3905,7 +3902,7 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
if (name_type_mask & eFunctionNameTypeFull) if (name_type_mask & eFunctionNameTypeFull)
{ {
FindFunctions (name, m_function_fullname_index, sc_list); FindFunctions (name, m_function_fullname_index, include_inlines, sc_list);
// FIXME Temporary workaround for global/anonymous namespace // FIXME Temporary workaround for global/anonymous namespace
// functions on FreeBSD and Linux // functions on FreeBSD and Linux
@ -3917,7 +3914,7 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
if (sc_list.GetSize() == 0) if (sc_list.GetSize() == 0)
{ {
SymbolContextList temp_sc_list; SymbolContextList temp_sc_list;
FindFunctions (name, m_function_basename_index, temp_sc_list); FindFunctions (name, m_function_basename_index, include_inlines, temp_sc_list);
if (!namespace_decl) if (!namespace_decl)
{ {
SymbolContext sc; SymbolContext sc;
@ -3949,16 +3946,13 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
const DWARFDebugInfoEntry* die = info->GetDIEPtrWithCompileUnitHint (die_offsets[i], &dwarf_cu); const DWARFDebugInfoEntry* die = info->GetDIEPtrWithCompileUnitHint (die_offsets[i], &dwarf_cu);
if (die) if (die)
{ {
if (!include_inlines && die->Tag() == DW_TAG_inlined_subroutine)
continue;
if (namespace_decl && !DIEIsInNamespace (namespace_decl, dwarf_cu, die)) if (namespace_decl && !DIEIsInNamespace (namespace_decl, dwarf_cu, die))
continue; continue;
// If we get to here, the die is good, and we should add it: // If we get to here, the die is good, and we should add it:
if (resolved_dies.find(die) == resolved_dies.end()) if (resolved_dies.find(die) == resolved_dies.end())
{ {
if (ResolveFunction (dwarf_cu, die, sc_list)) if (ResolveFunction (dwarf_cu, die, include_inlines, sc_list))
resolved_dies.insert(die); resolved_dies.insert(die);
} }
} }
@ -3978,13 +3972,10 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
const DWARFDebugInfoEntry* die = info->GetDIEPtrWithCompileUnitHint (die_offsets[i], &dwarf_cu); const DWARFDebugInfoEntry* die = info->GetDIEPtrWithCompileUnitHint (die_offsets[i], &dwarf_cu);
if (die) if (die)
{ {
if (!include_inlines && die->Tag() == DW_TAG_inlined_subroutine)
continue;
// If we get to here, the die is good, and we should add it: // If we get to here, the die is good, and we should add it:
if (resolved_dies.find(die) == resolved_dies.end()) if (resolved_dies.find(die) == resolved_dies.end())
{ {
if (ResolveFunction (dwarf_cu, die, sc_list)) if (ResolveFunction (dwarf_cu, die, include_inlines, sc_list))
resolved_dies.insert(die); resolved_dies.insert(die);
} }
} }
@ -3995,7 +3986,7 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
if ((name_type_mask & eFunctionNameTypeSelector) && (!namespace_decl || !*namespace_decl)) if ((name_type_mask & eFunctionNameTypeSelector) && (!namespace_decl || !*namespace_decl))
{ {
FindFunctions (name, m_function_selector_index, sc_list); FindFunctions (name, m_function_selector_index, include_inlines, sc_list);
} }
} }
@ -4006,9 +3997,10 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
if (log && num_matches > 0) if (log && num_matches > 0)
{ {
GetObjectFile()->GetModule()->LogMessage (log, GetObjectFile()->GetModule()->LogMessage (log,
"SymbolFileDWARF::FindFunctions (name=\"%s\", name_type_mask=0x%x, append=%u, sc_list) => %u", "SymbolFileDWARF::FindFunctions (name=\"%s\", name_type_mask=0x%x, include_inlines=%d, append=%u, sc_list) => %u",
name.GetCString(), name.GetCString(),
name_type_mask, name_type_mask,
include_inlines,
append, append,
num_matches); num_matches);
} }
@ -4044,7 +4036,7 @@ SymbolFileDWARF::FindFunctions(const RegularExpression& regex, bool include_inli
if (m_using_apple_tables) if (m_using_apple_tables)
{ {
if (m_apple_names_ap.get()) if (m_apple_names_ap.get())
FindFunctions (regex, *m_apple_names_ap, sc_list); FindFunctions (regex, *m_apple_names_ap, include_inlines, sc_list);
} }
else else
{ {
@ -4052,9 +4044,9 @@ SymbolFileDWARF::FindFunctions(const RegularExpression& regex, bool include_inli
if (!m_indexed) if (!m_indexed)
Index (); Index ();
FindFunctions (regex, m_function_basename_index, sc_list); FindFunctions (regex, m_function_basename_index, include_inlines, sc_list);
FindFunctions (regex, m_function_fullname_index, sc_list); FindFunctions (regex, m_function_fullname_index, include_inlines, sc_list);
} }
// Return the number of variable that were appended to the list // Return the number of variable that were appended to the list

6
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
View File

@ -393,10 +393,12 @@ protected:
// Given a die_offset, figure out the symbol context representing that die. // Given a die_offset, figure out the symbol context representing that die.
bool ResolveFunction (dw_offset_t offset, bool ResolveFunction (dw_offset_t offset,
DWARFCompileUnit *&dwarf_cu, DWARFCompileUnit *&dwarf_cu,
bool include_inlines,
lldb_private::SymbolContextList& sc_list); lldb_private::SymbolContextList& sc_list);
bool ResolveFunction (DWARFCompileUnit *cu, bool ResolveFunction (DWARFCompileUnit *cu,
const DWARFDebugInfoEntry *die, const DWARFDebugInfoEntry *die,
bool include_inlines,
lldb_private::SymbolContextList& sc_list); lldb_private::SymbolContextList& sc_list);
bool FunctionDieMatchesPartialName ( bool FunctionDieMatchesPartialName (
@ -410,16 +412,19 @@ protected:
void FindFunctions( void FindFunctions(
const lldb_private::ConstString &name, const lldb_private::ConstString &name,
const NameToDIE &name_to_die, const NameToDIE &name_to_die,
bool include_inlines,
lldb_private::SymbolContextList& sc_list); lldb_private::SymbolContextList& sc_list);
void FindFunctions ( void FindFunctions (
const lldb_private::RegularExpression &regex, const lldb_private::RegularExpression &regex,
const NameToDIE &name_to_die, const NameToDIE &name_to_die,
bool include_inlines,
lldb_private::SymbolContextList& sc_list); lldb_private::SymbolContextList& sc_list);
void FindFunctions ( void FindFunctions (
const lldb_private::RegularExpression &regex, const lldb_private::RegularExpression &regex,
const DWARFMappedHash::MemoryTable &memory_table, const DWARFMappedHash::MemoryTable &memory_table,
bool include_inlines,
lldb_private::SymbolContextList& sc_list); lldb_private::SymbolContextList& sc_list);
lldb::TypeSP FindDefinitionTypeForDWARFDeclContext ( lldb::TypeSP FindDefinitionTypeForDWARFDeclContext (
@ -438,6 +443,7 @@ protected:
lldb_private::Symbol * GetObjCClassSymbol (const lldb_private::ConstString &objc_class_name); lldb_private::Symbol * GetObjCClassSymbol (const lldb_private::ConstString &objc_class_name);
void ParseFunctions (const DIEArray &die_offsets, void ParseFunctions (const DIEArray &die_offsets,
bool include_inlines,
lldb_private::SymbolContextList& sc_list); lldb_private::SymbolContextList& sc_list);
lldb::TypeSP GetTypeForDIE (DWARFCompileUnit *cu, lldb::TypeSP GetTypeForDIE (DWARFCompileUnit *cu,
const DWARFDebugInfoEntry* die); const DWARFDebugInfoEntry* die);