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

Fixed the expression parser to ignore C++ and 

Objective-C method names when looking for functions
in the top level or a namespace.  Method names should
only be found via FindExternalLexicalDecls.

<rdar://problem/11711679>

llvm-svn: 160907
This commit is contained in:
Sean Callanan 2012-07-28 00:21:01 +00:00
parent 3ac187731e
commit 308a3c5412
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2703,6 +2703,9 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
{ {
const bool include_symbols = true; const bool include_symbols = true;
// TODO Fix FindFunctions so that it doesn't return
// instance methods for eFunctionNameTypeBase.
target->GetImages().FindFunctions(name, target->GetImages().FindFunctions(name,
eFunctionNameTypeBase, eFunctionNameTypeBase,
include_symbols, include_symbols,
@ -2725,6 +2728,14 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
if (sym_ctx.function) if (sym_ctx.function)
{ {
clang::DeclContext *decl_ctx = sym_ctx.function->GetClangDeclContext();
// Filter out class/instance methods.
if (dyn_cast<clang::ObjCMethodDecl>(decl_ctx))
continue;
if (dyn_cast<clang::CXXMethodDecl>(decl_ctx))
continue;
// TODO only do this if it's a C function; C++ functions may be // TODO only do this if it's a C function; C++ functions may be
// overloaded // overloaded
if (!context.m_found.function_with_type_info) if (!context.m_found.function_with_type_info)
@ -3281,10 +3292,15 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context,
{ {
ASTDumper ast_dumper(fun_decl); ASTDumper ast_dumper(fun_decl);
log->Printf(" CEDM::FEVD[%u] Found %s function %s, returned %s", StreamString ss;
fun_address->Dump(&ss, m_parser_vars->m_exe_ctx.GetBestExecutionContextScope(), Address::DumpStyleResolvedDescription);
log->Printf(" CEDM::FEVD[%u] Found %s function %s (description %s), returned %s",
current_id, current_id,
(fun ? "specific" : "generic"), (fun ? "specific" : "generic"),
decl_name.c_str(), decl_name.c_str(),
ss.GetData(),
ast_dumper.GetCString()); ast_dumper.GetCString());
} }
} }