Restore the ability of SBFrame::FindValue() to look for file global variables
This should clean up the new test failures caused by r201614
llvm-svn: 201710
diff --git a/lldb/source/API/SBFrame.cpp b/lldb/source/API/SBFrame.cpp
index 7d0a03f..44fc654 100644
--- a/lldb/source/API/SBFrame.cpp
+++ b/lldb/source/API/SBFrame.cpp
@@ -845,6 +845,8 @@
frame = exe_ctx.GetFramePtr();
if (frame)
{
+ VariableList variable_list;
+
switch (value_type)
{
case eValueTypeVariableGlobal: // global variable
@@ -852,8 +854,7 @@
case eValueTypeVariableArgument: // function argument variables
case eValueTypeVariableLocal: // function local variables
{
- VariableList variable_list;
-
+
SymbolContext sc (frame->GetSymbolContext (eSymbolContextBlock));
const bool can_create = true;
@@ -865,6 +866,13 @@
stop_if_block_is_inlined_function,
&variable_list))
{
+ if (value_type == eValueTypeVariableGlobal)
+ {
+ const bool get_file_globals = true;
+ VariableList* frame_vars = frame->GetVariableList(get_file_globals);
+ if (frame_vars)
+ frame_vars->AppendVariablesIfUnique(variable_list);
+ }
ConstString const_name(name);
VariableSP variable_sp(variable_list.FindVariable(const_name,value_type));
if (variable_sp)