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

Added checks to the expresssion parser which make 

searching for variables and symbols in the target
more robust.  These checks prevent variables from
being reported as existing if they cannot actually
be evaluated in the current context.

llvm-svn: 134656
This commit is contained in:
Sean Callanan 2011-07-07 23:05:43 +00:00
parent 7fcce6829d
commit c6466fc9ab
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -552,6 +552,9 @@ ClangExpressionDeclMap::GetFunctionAddress
else
return false;
if (!func_so_addr || !func_so_addr->IsValid())
return false;
func_addr = func_so_addr->GetCallableLoadAddress (m_parser_vars->m_exe_ctx->target);
return true;
@ -573,6 +576,10 @@ ClangExpressionDeclMap::GetSymbolAddress (Target &target, const ConstString &nam
sc_list.GetContextAtIndex(i, sym_ctx);
const Address *sym_address = &sym_ctx.symbol->GetAddressRangeRef().GetBaseAddress();
if (!sym_address || !sym_address->IsValid())
return LLDB_INVALID_ADDRESS;
if (sym_address)
{
switch (sym_ctx.symbol->GetType())
@ -1261,7 +1268,7 @@ ClangExpressionDeclMap::DoMaterializeOneVariable
NULL));
}
else if (sym)
{
{
location_value.reset(new Value);
addr_t location_load_addr = GetSymbolAddress(*exe_ctx.target, name);
@ -1591,6 +1598,11 @@ ClangExpressionDeclMap::FindVariableInScope
var_sp = program_globals.GetVariableAtIndex (0);
}
}
if (!var_sp ||
!var_sp->IsInScope(&frame) ||
!var_sp->LocationIsValidForFrame (&frame))
return lldb::VariableSP();
if (var_sp && type)
{