Commit 2c1a768e authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r182301: 

------------------------------------------------------------------------
r182301 | gclayton | 2013-05-20 09:50:51 -0700 (Mon, 20 May 2013) | 3 lines

Patch from Yacine Belkadi that fixes an issue in Variable::GetValuesForVariableExpressionPath().


------------------------------------------------------------------------

llvm-svn: 182519
parent 4b65dbc3

lldb/source/Symbol/Variable.cpp

+4 −4
Original line number Diff line number Diff line
@@ -416,8 +416,8 @@ Variable::GetValuesForVariableExpressionPath (const char *variable_expr_path, 
                                    ValueObjectSP variable_valobj_sp(ValueObjectVariable::Create (scope, var_sp));

                                    if (variable_valobj_sp)

                                    {

                                        variable_expr_path += variable_name.size();

                                        if (*variable_expr_path)

                                        const char *variable_sub_expr_path = variable_expr_path + variable_name.size();

                                        if (*variable_sub_expr_path)

                                        {

                                            const char* first_unparsed = NULL;

                                            ValueObject::ExpressionPathScanEndReason reason_to_stop;
@@ -425,7 +425,7 @@ Variable::GetValuesForVariableExpressionPath (const char *variable_expr_path, 
                                            ValueObject::GetValueForExpressionPathOptions options;

                                            ValueObject::ExpressionPathAftermath final_task_on_target;



                                            valobj_sp = variable_valobj_sp->GetValueForExpressionPath (variable_expr_path,

                                            valobj_sp = variable_valobj_sp->GetValueForExpressionPath (variable_sub_expr_path,

                                                                                                       &first_unparsed,

                                                                                                       &reason_to_stop,

                                                                                                       &final_value_type,
@@ -434,7 +434,7 @@ Variable::GetValuesForVariableExpressionPath (const char *variable_expr_path, 
                                            if (!valobj_sp)

                                            {

                                                error.SetErrorStringWithFormat ("invalid expression path '%s' for variable '%s'",

                                                                                variable_expr_path,

                                                                                variable_sub_expr_path,

                                                                                var_sp->GetName().GetCString());

                                            }

                                        }