VM: Share closure-call dispatchers.

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 197 matching lines @@
       Isolate::Current()->debugger()->StackTrace();
   intptr_t num_frames = stack->Length();
   const int kBufferLen = 2048;
   char* buffer = new char[kBufferLen];
   char* pos = buffer;
   LocalVarDescriptors& var_desc = LocalVarDescriptors::Handle();
   for (intptr_t i = 0; i < num_frames; i++) {
     ActivationFrame* frame = stack->FrameAt(i);
     var_desc = frame->code().var_descriptors();
     const char* var_str = SkipIndex(var_desc.ToCString());
+    const char* function_str = String::Handle(
+        frame->function().QualifiedUserVisibleName()).ToCString();
     pos += OS::SNPrint(pos, (kBufferLen - (pos - buffer)),
                        "%s\n%s",
-                       frame->function().ToQualifiedCString(),
+                       function_str,
                        var_str);
     delete [] var_str;
   }
   pos[0] = '\0';
   saved_vars = buffer;
 }
 
 
 // Uses the debugger to pause the program and capture the variable
 // descriptors for all frames on the stack.
@@ skipping 23 matching lines @@
       "  var value = 11;\n"
       "  int f(var param) {\n"
       "    return param + value;\n"  // line 4
       "  }\n"
       "  return f(22);\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   EXPECT_STREQ(
       // function f uses one ctx var at (0); doesn't save ctx.
-      "::.main_f\n"
+      "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"
 
       // Closure call saves current context.
-      "(dynamic, dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\n"
+      "_FunctionImpl.call\n"
+      " 0 StackVar      scope=1   begin=0   end=4   name=this\n"

[Florian Schneider, 2015/01/29 17:27:21]

This change is because _FunctionImpl is now the owner of these .call
dispatchers.

This 4 comes from the 4 \n at the start of runtime/lib/function.dart. The parser
fast-forwards across spaces to the first token.

       " 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"
+      "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"
       " 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"
       "    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);
   EXPECT_STREQ(
       // Innermost function uses captured variable 'value' from middle
       // function.
-      "::.a_b_c\n"
+      "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"
 
       // Closure call saves current context.
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       // 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"
+      "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"
       " 3 StackVar      scope=2   begin=18  end=38  name=c\n"
 
       // Closure call saves current context.
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       // Outermost function neglects to save the entry context.  We
       // don't save the entry context if the function has no captured
       // variables.
-      "::.a\n"
+      "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",
       CaptureVarsAtLine(lib, "a", 5));
 }
 
 
 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);
 
   EXPECT_STREQ(
       // bb captures only value2 from aa.  No others.
-      "::.a_b_aa_bb\n"
+      "a.b.aa.bb\n"
       " 0 ContextVar    level=0   begin=32  end=42  name=value2\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Closure call saves current context.
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       // 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"
+      "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"
       " 3 StackVar      scope=2   begin=30  end=50  name=bb\n"
 
       // Closure call saves current context.
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       // b captures value1 from a.
-      "::.a_b\n"
+      "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.
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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 shares value1, saves entry ctx.
-      "::.a\n"
+      "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"
       " 3 StackVar      scope=2   begin=12  end=68  name=b\n",
       CaptureVarsAtLine(lib, "a", 7));
 }
 
 
 TEST_CASE(Parser_AllocateVariables_Issue7681) {
@@ skipping 19 matching lines @@
       "    y.onY = () {\n"  // line 12
       "      return y;\n"
       "    };\n"
       "  };\n"
       "   x.onX(new Y());\n"
       "}\n";
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   EXPECT_STREQ(
       // This frame saves the entry context instead of chaining.  Good.
-      "::.doIt_<anonymous closure>\n"
+      "doIt.<anonymous closure>\n"
       " 0 ContextLevel  level=1   scope=1   begin=41  end=62\n"
       " 1 ContextVar    level=1   begin=42  end=62  name=y\n"
       " 2 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Closure call saves current context.
-      "(dynamic, dynamic) => dynamic.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       "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"
+      "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",
       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.
   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);
   EXPECT_STREQ(
       // inner function captures variable value.  That's fine.
-      "::.outer_inner\n"
+      "outer.inner\n"
       " 0 ContextVar    level=0   begin=32  end=42  name=value\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
 
       // Closure call saves current context.
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       // The outer function saves the entry context, even though the
       // captured variable is in a loop.  Good.
-      "::.outer\n"
+      "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"
       " 2 ContextLevel  level=1   scope=4   begin=20  end=50\n"
       " 3 ContextVar    level=1   begin=23  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"
       "      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);
   EXPECT_STREQ(
-      "::.a_b_c\n"
+      "a.b.c\n"
       " 0 ContextVar    level=0   begin=48  end=60  name=x\n"
       " 1 CurrentCtx    scope=0   begin=0   end=0"
       "   name=:current_context_var\n"
-      "(dynamic) => int.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
 
       // Doesn't save the entry context.  Chains to parent instead.
-      "::.a_b\n"
+      "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"
       " 5 StackVar      scope=4   begin=32  end=46  name=d\n"
 
-      "(dynamic) => dynamic.call\n"
-      " 0 StackVar      scope=1   begin=0   end=0   name=this\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"
+      "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"
       " 3 StackVar      scope=2   begin=11  end=76  name=b\n",
       CaptureVarsAtLine(lib, "a", 10));
 }
 
 }  // namespace dart