[llvm-branch-commits] [lldb] r182519 - Merging r182301:

[Bill Wendling]

Author: void
Date: Wed May 22 16:23:42 2013
New Revision: 182519

URL: http://llvm.org/viewvc/llvm-project?rev=182519&view=rev
Log:
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().


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

Modified:
    lldb/branches/release_33/   (props changed)
    lldb/branches/release_33/source/Symbol/Variable.cpp

Propchange: lldb/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 22 16:23:42 2013
@@ -1,2 +1,2 @@
 /lldb/branches/apple/python-GIL:156467-162159
-/lldb/trunk:182066,182153,182166
+/lldb/trunk:182066,182153,182166,182301

Modified: lldb/branches/release_33/source/Symbol/Variable.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_33/source/Symbol/Variable.cpp?rev=182519&r1=182518&r2=182519&view=diff
==============================================================================
--- lldb/branches/release_33/source/Symbol/Variable.cpp (original)
+++ lldb/branches/release_33/source/Symbol/Variable.cpp Wed May 22 16:23:42 2013
@@ -416,8 +416,8 @@ Variable::GetValuesForVariableExpression
                                     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::GetValuesForVariableExpression
                                             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::GetValuesForVariableExpression
                                             if (!valobj_sp)
                                             {
                                                 error.SetErrorStringWithFormat ("invalid expression path '%s' for variable '%s'",
-                                                                                variable_expr_path,
+                                                                                variable_sub_expr_path,
                                                                                 var_sp->GetName().GetCString());
                                             }
                                         }