VM: Fix issue with local variable values reported by the debugger.

runtime/vm/parser_test.cc

Index: runtime/vm/parser_test.cc
===================================================================
--- runtime/vm/parser_test.cc	(revision 43843)
+++ runtime/vm/parser_test.cc	(working copy)
@@ -280,7 +280,7 @@
       " 0 ContextLevel  level=1   scope=1   begin=2   end=37\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 2 ContextVar    level=1   begin=7   end=37  name=value\n"
+      " 2 ContextVar    level=1   begin=10  end=37  name=value\n"
       " 3 StackVar      scope=2   begin=12  end=37  name=f\n",
       CaptureVarsAtLine(lib, "main", 4));
 }
@@ -321,7 +321,7 @@
       " 0 ContextLevel  level=1   scope=1   begin=8   end=38\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 2 ContextVar    level=1   begin=13  end=38  name=value\n"
+      " 2 ContextVar    level=1   begin=16  end=38  name=value\n"
       " 3 StackVar      scope=2   begin=18  end=38  name=c\n"
 
       // Closure call saves current context.
@@ -380,7 +380,7 @@
       " 0 ContextLevel  level=1   scope=1   begin=20  end=50\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 2 ContextVar    level=1   begin=25  end=50  name=value2\n"
+      " 2 ContextVar    level=1   begin=28  end=50  name=value2\n"
       " 3 StackVar      scope=2   begin=30  end=50  name=bb\n"
 
       // Closure call saves current context.
@@ -407,7 +407,7 @@
       " 0 ContextLevel  level=1   scope=1   begin=2   end=68\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 2 ContextVar    level=1   begin=7   end=68  name=value1\n"
+      " 2 ContextVar    level=1   begin=10  end=68  name=value1\n"
       " 3 StackVar      scope=2   begin=12  end=68  name=b\n",
       CaptureVarsAtLine(lib, "a", 7));
 }
@@ -464,7 +464,7 @@
       "doIt\n"
       " 0 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 1 StackVar      scope=2   begin=29  end=77  name=x\n",
+      " 1 StackVar      scope=2   begin=35  end=77  name=x\n",
       CaptureVarsAtLine(lib, "doIt", 12));
 }
 
@@ -505,9 +505,9 @@
       "outer\n"
       " 0 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 1 StackVar      scope=3   begin=9   end=50  name=i\n"
+      " 1 StackVar      scope=3   begin=12  end=50  name=i\n"
       " 2 ContextLevel  level=1   scope=4   begin=20  end=50\n"
-      " 3 ContextVar    level=1   begin=23  end=50  name=value\n"
+      " 3 ContextVar    level=1   begin=28  end=50  name=value\n"
       " 4 StackVar      scope=4   begin=30  end=50  name=inner\n",
       CaptureVarsAtLine(lib, "outer", 5));
 }
@@ -548,7 +548,7 @@
       "   name=:current_context_var\n"
       " 2 StackVar      scope=2   begin=46  end=68  name=c\n"
       " 3 ContextLevel  level=1   scope=3   begin=18  end=46\n"
-      " 4 ContextVar    level=1   begin=19  end=46  name=i\n"
+      " 4 ContextVar    level=1   begin=22  end=46  name=i\n"
       " 5 StackVar      scope=4   begin=32  end=46  name=d\n"
 
       "_FunctionImpl.call\n"
@@ -560,7 +560,7 @@
       " 0 ContextLevel  level=1   scope=1   begin=1   end=76\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 2 ContextVar    level=1   begin=6   end=76  name=x\n"
+      " 2 ContextVar    level=1   begin=9   end=76  name=x\n"
       " 3 StackVar      scope=2   begin=11  end=76  name=b\n",
       CaptureVarsAtLine(lib, "a", 10));
 }