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

runtime/vm/parser_test.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 
 #include "vm/ast_printer.h"
 #include "vm/class_finalizer.h"
 #include "vm/debugger.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
@@ skipping 262 matching lines @@
       "_FunctionImpl.call\n"
       " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // function main uses one ctx var at (1); saves caller ctx.
       "main\n"
       " 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));
 }
 
 
 TEST_CASE(Parser_AllocateVariables_NestedCapturedVar) {
   const char* kScriptChars =
       "int a() {\n"
       "  int b() {\n"
       "    var value = 11;\n"
@@ skipping 20 matching lines @@
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Middle function saves the entry context.  Notice that this
       // happens here and not in the outermost function.  We always
       // save the entry context at the last possible moment.
       "a.b\n"
       " 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.
       "_FunctionImpl.call\n"
       " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Outermost function neglects to save the entry context.  We
       // don't save the entry context if the function has no captured
@@ skipping 38 matching lines @@
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // aa shares value2. Notice that we save the entry ctx instead
       // of chaining from b.  This keeps us from holding onto closures
       // that we would never access.
       "a.b.aa\n"
       " 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.
       "_FunctionImpl.call\n"
       " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // b captures value1 from a.
       "a.b\n"
       " 0 ContextVar    level=0   begin=14  end=60  name=value1\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
       " 2 StackVar      scope=2   begin=18  end=60  name=aa\n"
 
       // Closure call saves current context.
       "_FunctionImpl.call\n"
       " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // a shares value1, saves entry ctx.
       "a\n"
       " 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));
 }
 
 
 TEST_CASE(Parser_AllocateVariables_Issue7681) {
   // This is a distilled version of the program from Issue 7681.
   //
   // When we create the closure at line 11, we need to make sure to
   // save the entry context instead of chaining to the parent context.
@@ skipping 36 matching lines @@
 
       "X.onX\n"
       " 0 StackVar      scope=1   begin=0   end=0   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // No context is saved here since no vars are captured.
       "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));
 }
 
 
 TEST_CASE(Parser_AllocateVariables_CaptureLoopVar) {
   // This test verifies that...
   //
   //   https://code.google.com/p/dart/issues/detail?id=18561
   //
   // ...stays fixed.
@@ skipping 20 matching lines @@
       "_FunctionImpl.call\n"
       " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // The outer function saves the entry context, even though the
       // captured variable is in a loop.  Good.
       "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));
 }
 
 TEST_CASE(Parser_AllocateVariables_MiddleChain) {
   const char* kScriptChars =
       "a() {\n"
       "  int x = 11;\n"
       "  b() {\n"
       "    for (int i = 0; i < 1; i++) {\n"
@@ skipping 20 matching lines @@
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Doesn't save the entry context.  Chains to parent instead.
       "a.b\n"
       " 0 ContextVar    level=0   begin=12  end=68  name=x\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   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"
       " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       "a\n"
       " 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));
 }
 
 }  // namespace dart