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

Made the expression parser's type search call the 

proper namespace-aware APIs.

llvm-svn: 141797
This commit is contained in:
Sean Callanan 2011-10-12 18:44:30 +00:00
parent 93663b3c62
commit 1a2c5386cd
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2131,7 +2131,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, co
void
ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
lldb::ModuleSP module,
lldb::ModuleSP module_sp,
ClangNamespaceDecl &namespace_decl,
const ConstString &name)
{
@ -2355,7 +2355,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
else if (target)
{
var = FindGlobalVariable (*target,
module,
module_sp,
name,
&namespace_decl,
NULL);
@ -2372,14 +2372,14 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
const bool include_symbols = true;
const bool append = false;
if (namespace_decl && module)
if (namespace_decl && module_sp)
{
module->FindFunctions(name,
&namespace_decl,
eFunctionNameTypeBase,
include_symbols,
append,
sc_list);
module_sp->FindFunctions(name,
&namespace_decl,
eFunctionNameTypeBase,
include_symbols,
append,
sc_list);
}
else
{
@ -2441,17 +2441,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
// We couldn't find a variable or function for this. Now we'll hunt for a generic
// data symbol, and -- if it is found -- treat it as a variable.
Symbol *data_symbol;
if (namespace_decl && module)
{
data_symbol = FindGlobalDataSymbol(*target, module, name, &namespace_decl);
}
else
{
ModuleSP module;
data_symbol = FindGlobalDataSymbol(*target, module, name, NULL);
}
Symbol *data_symbol = FindGlobalDataSymbol(*target, module_sp, name, &namespace_decl);
if (data_symbol)
{
@ -2510,20 +2500,28 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
}
}
lldb::TypeSP type_sp (m_parser_vars->m_sym_ctx.FindTypeByName (name));
if (type_sp)
TypeList types;
SymbolContext null_sc;
if (module_sp && namespace_decl)
module_sp->FindTypes(null_sc, name, &namespace_decl, true, 1, types);
else
target->GetImages().FindTypes (null_sc, name, true, 1, types);
if (types.GetSize())
{
TypeSP type_sp = types.GetTypeAtIndex(0);
if (log)
{
log->Printf ("Matching type found for \"%s\": ", name.GetCString());
log->Printf("Matching type found for \"%s\": ", name.GetCString());
StreamString strm;
type_sp->Dump(&strm, true);
log->PutCString (strm.GetData());
}
TypeFromUser user_type (type_sp->GetClangFullType(),
type_sp->GetClangAST());
TypeFromUser user_type(type_sp->GetClangFullType(),
type_sp->GetClangAST());
AddOneType(context, user_type, false);
}