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

For cases where a const function is inaccurately reported 

as non-const in the debug information, added a fallback
to GetFunctionAddress, adding the const qualifier after
the fact and searching again.

llvm-svn: 131299
This commit is contained in:
Sean Callanan 2011-05-13 18:27:02 +00:00
parent a52b1f72ef
commit 19b6afe35e
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lldb/source/Expression/ClangExpressionDeclMap.cpp
View File

@ -500,6 +500,8 @@ ClangExpressionDeclMap::GetFunctionAddress
{ {
assert (m_parser_vars.get()); assert (m_parser_vars.get());
lldb::LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
// Back out in all cases where we're not fully initialized // Back out in all cases where we're not fully initialized
if (m_parser_vars->m_exe_ctx->target == NULL) if (m_parser_vars->m_exe_ctx->target == NULL)
return false; return false;
@ -511,6 +513,30 @@ ClangExpressionDeclMap::GetFunctionAddress
const bool append = false; const bool append = false;
m_parser_vars->m_sym_ctx.FindFunctionsByName(name, include_symbols, append, sc_list); m_parser_vars->m_sym_ctx.FindFunctionsByName(name, include_symbols, append, sc_list);
if (!sc_list.GetSize())
{
// We occasionally get debug information in which a const function is reported
// as non-const, so the mangled name is wrong. This is a hack to compensate.
Mangled mangled(name.GetCString(), true);
ConstString demangled_name = mangled.GetDemangledName();
if (strlen(demangled_name.GetCString()))
{
std::string const_name_scratch(demangled_name.GetCString());
const_name_scratch.append(" const");
ConstString const_name(const_name_scratch.c_str());
m_parser_vars->m_sym_ctx.FindFunctionsByName(const_name, include_symbols, append, sc_list);
if (log)
log->Printf("Found %d results with const name %s", sc_list.GetSize(), const_name.GetCString());
}
}
if (!sc_list.GetSize()) if (!sc_list.GetSize())
return false; return false;