Pass closure object as first implicit argument to closure functions.

runtime/vm/dart_entry.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/dart_entry.h"
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
@@ skipping 81 matching lines @@
   ASSERT(Class::Handle(closure.clazz()).signature_function() != Object::null());
   const Function& function = Function::Handle(Closure::function(closure));
   const Context& context = Context::Handle(Closure::context(closure));
   ASSERT(!function.IsNull());
   if (!function.HasCode()) {
     const Error& error = Error::Handle(Compiler::CompileFunction(function));
     if (!error.IsNull()) {
       return error.raw();
     }
   }
+  // Set up arguments to include the closure as the first argument.
+  const int num_arguments = arguments.length() + 1;
+  GrowableArray<const Object*> args(num_arguments);
+  const Object& arg0 = Object::ZoneHandle(closure.raw());
+  args.Add(&arg0);
+  for (int i = 1; i < num_arguments; i++) {
+    args.Add(arguments[i - 1]);
+  }
   // Now Call the invoke stub which will invoke the closure.
   invokestub entrypoint = reinterpret_cast<invokestub>(
       StubCode::InvokeDartCodeEntryPoint());
   ASSERT(context.isolate() == Isolate::Current());
   const Code& code = Code::Handle(function.CurrentCode());
   ASSERT(!code.IsNull());
   return entrypoint(
       code.EntryPoint(),
-      ArgumentsDescriptor(arguments.length(), optional_arguments_names),
-      arguments.data(),
+      ArgumentsDescriptor(num_arguments, optional_arguments_names),
+      args.data(),
       context);
 }
 
 
 const Array& DartEntry::ArgumentsDescriptor(
     int num_arguments,
     const Array& optional_arguments_names) {
   const intptr_t num_named_args =
       optional_arguments_names.IsNull() ? 0 : optional_arguments_names.Length();
   const intptr_t num_pos_args = num_arguments - num_named_args;
@@ skipping 192 matching lines @@
   const String& func_name = String::Handle(Field::GetterName(field_name));
   const Function& func = Function::Handle(cls.LookupDynamicFunction(func_name));
   ASSERT(!func.IsNull());
   GrowableArray<const Object*> arguments;
   const Array& kNoArgumentNames = Array::Handle();
   return DartEntry::InvokeDynamic(port, func, arguments, kNoArgumentNames);
 }
 
 
 }  // namespace dart