Remember deopt-id -> context-level mappings in var descriptors.

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 254 matching lines @@
       "    return param + value;\n"  // line 4
       "  }\n"
       "  return f(22);\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   char* vars = CaptureVarsAtLine(lib, "main", 4);
   EXPECT_STREQ(
       // function f uses one ctx var at (0); doesn't save ctx.
       "main.f\n"
-      " 0 ContextVar    level=0   begin=14  end=28  name=value\n"
-      " 1 StackVar      scope=1   begin=16  end=28  name=param\n"
-      " 2 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
+      " 0 ContextLevel  level=0   begin=0   end=12\n"
+      " 1 ContextVar    level=0   begin=14  end=28  name=value\n"
+      " 2 StackVar      scope=1   begin=16  end=28  name=param\n"
+      " 3 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
 
       // Closure call saves current context.
       "_Closure.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"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
-      " 1 ContextLevel  level=1   scope=2   begin=4   end=37\n"
-      " 2 ContextVar    level=1   begin=10  end=37  name=value\n"
-      " 3 StackVar      scope=2   begin=12  end=37  name=f\n",
+      " 0 ContextLevel  level=0   begin=0   end=6\n"
+      " 1 ContextLevel  level=1   begin=8   end=16\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 3 ContextVar    level=1   begin=10  end=37  name=value\n"
+      " 4 StackVar      scope=2   begin=12  end=37  name=f\n",
       vars);
   free(vars);
 }
 
 
 TEST_CASE(Parser_AllocateVariables_NestedCapturedVar) {
   const char* kScriptChars =
       "int a() {\n"
       "  int b() {\n"
       "    var value = 11;\n"
       "    int c() {\n"
       "      return value;\n"  // line 5
       "    }\n"
       "    return c();\n"
       "  }\n"
       "  return b();\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   char* vars = CaptureVarsAtLine(lib, "a", 5);
   EXPECT_STREQ(
       // Innermost function uses captured variable 'value' from middle
       // function.
       "a.b.c\n"
-      " 0 ContextVar    level=0   begin=20  end=30  name=value\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
+      " 0 ContextLevel  level=0   begin=0   end=10\n"
+      " 1 ContextVar    level=0   begin=20  end=30  name=value\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
 
       // Closure call saves current context.
       "_Closure.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"
-
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
-      " 1 ContextLevel  level=1   scope=2   begin=10  end=38\n"
-      " 2 ContextVar    level=1   begin=16  end=38  name=value\n"
-      " 3 StackVar      scope=2   begin=18  end=38  name=c\n"
+      " 0 ContextLevel  level=0   begin=0   end=6\n"
+      " 1 ContextLevel  level=1   begin=8   end=16\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 3 ContextVar    level=1   begin=16  end=38  name=value\n"
+      " 4 StackVar      scope=2   begin=18  end=38  name=c\n"
 
       // Closure call saves current context.
       "_Closure.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"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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
       // variables.
       "a\n"
-      " 0 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
-      " 1 StackVar      scope=2   begin=6   end=46  name=b\n",
+      " 0 ContextLevel  level=0   begin=0   end=14\n"
+      " 1 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 2 StackVar      scope=2   begin=6   end=46  name=b\n",
       vars);
   free(vars);
 }
 
 
 TEST_CASE(Parser_AllocateVariables_TwoChains) {
   const char* kScriptChars =
       "int a() {\n"
       "  var value1 = 11;\n"
       "  int b() {\n"
       "    int aa() {\n"
       "      var value2 = 12;\n"
       "      int bb() {\n"
       "        return value2;\n"  // line 7
       "      }\n"
       "      return bb();\n"
       "    }\n"
       "    return value1 + aa();\n"
       "  }\n"
       "  return b();\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
 
   char* vars = CaptureVarsAtLine(lib, "a", 7);
   EXPECT_STREQ(
       // bb captures only value2 from aa.  No others.
       "a.b.aa.bb\n"
-      " 0 ContextVar    level=0   begin=34  end=44  name=value2\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
+      " 0 ContextLevel  level=0   begin=0   end=10\n"
+      " 1 ContextVar    level=0   begin=34  end=44  name=value2\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Closure call saves current context.
       "_Closure.call\n"
-      " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
-      " 1 ContextLevel  level=1   scope=2   begin=22  end=53\n"
-      " 2 ContextVar    level=1   begin=29  end=53  name=value2\n"
-      " 3 StackVar      scope=2   begin=31  end=53  name=bb\n"
+      " 0 ContextLevel  level=0   begin=0   end=6\n"
+      " 1 ContextLevel  level=1   begin=8   end=16\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 3 ContextVar    level=1   begin=29  end=53  name=value2\n"
+      " 4 StackVar      scope=2   begin=31  end=53  name=bb\n"
 
       // Closure call saves current context.
       "_Closure.call\n"
-      " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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=63  name=value1\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
+      " 0 ContextLevel  level=0   begin=0   end=16\n"
+      " 1 ContextVar    level=0   begin=14  end=63  name=value1\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 2 StackVar      scope=2   begin=18  end=63  name=aa\n"
+      " 3 StackVar      scope=2   begin=18  end=63  name=aa\n"
 
       // Closure call saves current context.
       "_Closure.call\n"
-      " 0 StackVar      scope=1   begin=0   end=4   name=this\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // a shares value1, saves entry ctx.
       "a\n"
-      " 0 CurrentCtx    scope=0   begin=0   end=0"
+      " 0 ContextLevel  level=0   begin=0   end=6\n"
+      " 1 ContextLevel  level=1   begin=8   end=16\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      " 1 ContextLevel  level=1   scope=2   begin=4   end=71\n"
-      " 2 ContextVar    level=1   begin=10  end=71  name=value1\n"
-      " 3 StackVar      scope=2   begin=12  end=71  name=b\n",
+      " 3 ContextVar    level=1   begin=10  end=71  name=value1\n"
+      " 4 StackVar      scope=2   begin=12  end=71  name=b\n",
       vars);
   free(vars);
 }
 
 
 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 17 matching lines @@
       "    };\n"
       "  };\n"
       "   x.onX(new Y());\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   char* vars = CaptureVarsAtLine(lib, "doIt", 12);
   EXPECT_STREQ(
       // This frame saves the entry context instead of chaining.  Good.
       "doIt.<anonymous closure>\n"
-      " 0 ContextLevel  level=1   scope=1   begin=41  end=65\n"
-      " 1 ContextVar    level=1   begin=42  end=65  name=y\n"
-      " 2 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
+      " 0 ContextLevel  level=0   begin=0   end=0\n"
+      " 1 ContextLevel  level=1   begin=4   end=12\n"
+      " 2 ContextVar    level=1   begin=42  end=65  name=y\n"
+      " 3 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
 
       // Closure call saves current context.
       "_Closure.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"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
 
       "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"
+      " 0 ContextLevel  level=0   begin=0   end=10\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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=35  end=80  name=x\n",
+      " 0 ContextLevel  level=0   begin=0   end=18\n"
+      " 1 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 2 StackVar      scope=2   begin=35  end=80  name=x\n",
       vars);
   free(vars);
 }
 
 
 TEST_CASE(Parser_AllocateVariables_CaptureLoopVar) {
   // This test verifies that...
   //
   //   https://code.google.com/p/dart/issues/detail?id=18561
   //
   // ...stays fixed.
   const char* kScriptChars =
       "int outer() {\n"
       "  for(int i = 0; i < 1; i++) {\n"
       "    var value = 11 + i;\n"
       "    int inner() {\n"
       "      return value;\n"  // line 5
       "    }\n"
       "    return inner();\n"
       "  }\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   char* vars = CaptureVarsAtLine(lib, "outer", 5);
   EXPECT_STREQ(
       // inner function captures variable value.  That's fine.
       "outer.inner\n"
-      " 0 ContextVar    level=0   begin=33  end=43  name=value\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
+      " 0 ContextLevel  level=0   begin=0   end=10\n"
+      " 1 ContextVar    level=0   begin=33  end=43  name=value\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
 
       // Closure call saves current context.
       "_Closure.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"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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=12  end=52  name=i\n"
-      " 2 ContextLevel  level=1   scope=4   begin=20  end=52\n"
-      " 3 ContextVar    level=1   begin=28  end=52  name=value\n"
-      " 4 StackVar      scope=4   begin=30  end=52  name=inner\n",
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 ContextLevel  level=1   begin=10  end=18\n"
+      " 2 ContextLevel  level=0   begin=20  end=34\n"
+      " 3 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 4 StackVar      scope=3   begin=12  end=52  name=i\n"
+      " 5 ContextVar    level=1   begin=28  end=52  name=value\n"
+      " 6 StackVar      scope=4   begin=30  end=52  name=inner\n",
       vars);
   free(vars);
 }
 
 TEST_CASE(Parser_AllocateVariables_MiddleChain) {
   const char* kScriptChars =
       "a() {\n"
       "  int x = 11;\n"
       "  b() {\n"
       "    for (int i = 0; i < 1; i++) {\n"
       "      int d() {\n"
       "        return i;\n"
       "      }\n"
       "    }\n"
       "    int c() {\n"
       "      return x + 1;\n"  // line 10
       "    }\n"
       "    return c();\n"
       "  }\n"
       "  return b();\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   char* vars = CaptureVarsAtLine(lib, "a", 10);
   EXPECT_STREQ(
       "a.b.c\n"
-      " 0 ContextVar    level=0   begin=51  end=64  name=x\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
+      " 0 ContextLevel  level=0   begin=0   end=12\n"
+      " 1 ContextVar    level=0   begin=51  end=64  name=x\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+
       "_Closure.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"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 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=73  name=x\n"
-      " 1 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
-      " 2 StackVar      scope=2   begin=48  end=73  name=c\n"
-      " 3 ContextLevel  level=1   scope=3   begin=18  end=48\n"
-      " 4 ContextVar    level=1   begin=22  end=48  name=i\n"
-      " 5 StackVar      scope=4   begin=33  end=48  name=d\n"
+      " 0 ContextLevel  level=0   begin=0   end=6\n"
+      " 1 ContextLevel  level=1   begin=8   end=32\n"
+      " 2 ContextLevel  level=0   begin=34  end=40\n"
+      " 3 ContextVar    level=0   begin=12  end=73  name=x\n"
+      " 4 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 5 StackVar      scope=2   begin=48  end=73  name=c\n"
+      " 6 ContextVar    level=1   begin=22  end=48  name=i\n"
+      " 7 StackVar      scope=4   begin=33  end=48  name=d\n"
 
       "_Closure.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"
+      " 0 ContextLevel  level=0   begin=0   end=8\n"
+      " 1 StackVar      scope=1   begin=-1  end=0   name=this\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
 
       "a\n"
-      " 0 CurrentCtx    scope=0   begin=0   end=0"
-      "   name=:current_context_var\n"
-      " 1 ContextLevel  level=1   scope=2   begin=3   end=81\n"
-      " 2 ContextVar    level=1   begin=9   end=81  name=x\n"
-      " 3 StackVar      scope=2   begin=11  end=81  name=b\n",
+      " 0 ContextLevel  level=0   begin=0   end=6\n"
+      " 1 ContextLevel  level=1   begin=8   end=16\n"
+      " 2 CurrentCtx    scope=0   begin=0   end=0   name=:current_context_var\n"
+      " 3 ContextVar    level=1   begin=9   end=81  name=x\n"
+      " 4 StackVar      scope=2   begin=11  end=81  name=b\n",
       vars);
   free(vars);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart