Changed the API in DartEntry for invoking dart code from C++ to make it more compatible with the re…

lib/invocation_mirror.cc

 // Copyright (c) 2012, 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/bootstrap_natives.h"
 
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/exceptions.h"
 #include "vm/native_entry.h"
@@ skipping 15 matching lines @@
   Class& invocation_mirror_class =
       Class::Handle(core_lib.LookupClassAllowPrivate(invocation_mirror_name));
   ASSERT(!invocation_mirror_class.IsNull());
   const String& allocation_function_name =
       String::Handle(Symbols::AllocateInvocationMirror());
   const Function& allocation_function = Function::Handle(
       Resolver::ResolveStaticByName(invocation_mirror_class,
                                     allocation_function_name,
                                     Resolver::kIsQualified));
   ASSERT(!allocation_function.IsNull());
-  GrowableArray<const Object*> allocation_arguments(3);
-  allocation_arguments.Add(&target_name);
-  allocation_arguments.Add(&arguments_descriptor);
-  allocation_arguments.Add(&arguments);
-  const Array& kNoArgumentNames = Array::Handle();
+  const int kNumAllocationArgs = 3;
+  const Array& allocation_args = Array::Handle(Array::New(kNumAllocationArgs));
+  allocation_args.SetAt(0, target_name);
+  allocation_args.SetAt(1, arguments_descriptor);
+  allocation_args.SetAt(2, arguments);
   const Object& invocation_mirror =
       Object::Handle(DartEntry::InvokeStatic(allocation_function,
-                                             allocation_arguments,
-                                             kNoArgumentNames));
+                                             allocation_args));
 
   const String& function_name = String::Handle(Symbols::NoSuchMethod());
-  const int kNumArguments = 2;
-  const int kNumNamedArguments = 0;
+  const int kNumInvokeArgs = 2;
+  const int kNumNamedInvokeArgs = 0;
   const Function& function = Function::Handle(
       Resolver::ResolveDynamic(receiver,
                                function_name,
-                               kNumArguments,
-                               kNumNamedArguments));
+                               kNumInvokeArgs,
+                               kNumNamedInvokeArgs));
   ASSERT(!function.IsNull());
-  GrowableArray<const Object*> invoke_arguments(1);
-  invoke_arguments.Add(&invocation_mirror);
+  const Array& invoke_arguments = Array::Handle(Array::New(kNumInvokeArgs));
+  invoke_arguments.SetAt(0, receiver);
+  invoke_arguments.SetAt(1, invocation_mirror);
   const Object& result =
-      Object::Handle(DartEntry::InvokeDynamic(receiver,
-                                              function,
-                                              invoke_arguments,
-                                              kNoArgumentNames));
+      Object::Handle(DartEntry::InvokeDynamic(function, invoke_arguments));
   if (result.IsError()) {
     Exceptions::PropagateError(Error::Cast(result));
   }
   return result.raw();
 }
 
 
 DEFINE_NATIVE_ENTRY(InvocationMirror_invoke, 4) {
   const Instance& receiver = Instance::CheckedHandle(arguments->NativeArgAt(0));
   const String& fun_name = String::CheckedHandle(arguments->NativeArgAt(1));
@@ skipping 16 matching lines @@
       Resolver::ResolveDynamic(receiver,
                                fun_name,
                                args_desc.Count(),
                                args_desc.NamedCount()));
   if (function.IsNull()) {
     return InvokeNoSuchMethod(receiver,
                               fun_name,
                               fun_args_desc,
                               invoke_arguments);
   }
-  // TODO(regis): Simply call DartEntry::InvokeDynamic once it is modified to
-  // take an arguments descriptor array and an arguments array.
-  // Get the entrypoint corresponding to the instance function. This will
-  // result in a compilation of the function if it is not already compiled.
   ASSERT(!function.IsNull());
-  if (!function.HasCode()) {
-    const Error& error = Error::Handle(Compiler::CompileFunction(function));
-    if (!error.IsNull()) {
-      Exceptions::PropagateError(error);
-    }
-  }
-  // Set up arguments as GrowableArray.
-  GrowableArray<const Object*> args(num_arguments);
-  for (int i = 0; i < num_arguments; i++) {
-    args.Add(&Object::ZoneHandle(invoke_arguments.At(i)));
-  }
-  // Now call the invoke stub which will invoke the function.
-  DartEntry::invokestub entrypoint = reinterpret_cast<DartEntry::invokestub>(
-      StubCode::InvokeDartCodeEntryPoint());
-  const Code& code = Code::Handle(function.CurrentCode());
-  ASSERT(!code.IsNull());
-  const Context& context = Context::ZoneHandle(
-      Isolate::Current()->object_store()->empty_context());
-  const Object& result = Object::Handle(
-      entrypoint(code.EntryPoint(), fun_args_desc, args.data(), context));
+  const Object& result =
+      Object::Handle(DartEntry::InvokeDynamic(function,
+                                              invoke_arguments,
+                                              fun_args_desc));
   if (result.IsError()) {
     Exceptions::PropagateError(Error::Cast(result));
   }
   return result.raw();
 }
 
 }  // namespace dart