Simplify method invocation runtime entries.

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
@@ skipping 1073 matching lines @@
                                              kNumNamedArguments);
   ASSERT(!target_function.IsNull());
   GrowableArray<intptr_t> class_ids(kNumArguments);
   ASSERT(ic_data.num_args_tested() == kNumArguments);
   class_ids.Add(Class::Handle(receiver.clazz()).id());
   class_ids.Add(Class::Handle(arg1.clazz()).id());
   ic_data.AddCheck(class_ids, target_function);
 }
 
 
+// Invoke appropriate noSuchMethod function.
+// Arg0: receiver.
+// Arg1: ic-data.
+// Arg2: arguments descriptor array.
+// Arg3: arguments array.
+DEFINE_RUNTIME_ENTRY(InvokeNoSuchMethodFunction, 4) {
+  ASSERT(arguments.ArgCount() ==
+         kInvokeNoSuchMethodFunctionRuntimeEntry.argument_count());
+  const Instance& receiver = Instance::CheckedHandle(arguments.ArgAt(0));
+  const ICData& ic_data = ICData::CheckedHandle(arguments.ArgAt(1));
+  const Array& orig_arguments_desc = Array::CheckedHandle(arguments.ArgAt(2));
+  const Array& orig_arguments = Array::CheckedHandle(arguments.ArgAt(3));
+
+  const String& original_function_name = String::Handle(ic_data.target_name());
+  const Object& result = Object::Handle(
+      DartEntry::InvokeNoSuchMethod(receiver,
+                                    original_function_name,
+                                    orig_arguments,
+                                    orig_arguments_desc));
+  CheckResultError(result);
+  arguments.SetReturn(result);
+}
+
+
+// A non-closure object was invoked as a closure, so call the "call" method
+// on it.
+// Arg0: non-closure object.
+// Arg1: arguments descriptor.
+// Arg2: arguments array, including non-closure object.
+DEFINE_RUNTIME_ENTRY(InvokeNonClosure, 3) {
+  ASSERT(arguments.ArgCount() ==
+         kInvokeNonClosureRuntimeEntry.argument_count());
+  const Instance& instance = Instance::CheckedHandle(arguments.ArgAt(0));
+  const Array& args_descriptor = Array::CheckedHandle(arguments.ArgAt(1));
+  const Array& function_args = Array::CheckedHandle(arguments.ArgAt(2));
+
+  const Object& result = Object::Handle(
+      DartEntry::InvokeClosure(instance,
+                               function_args,
+                               args_descriptor));
+  CheckResultError(result);
+  arguments.SetReturn(result);
+}
+
+
 // An instance call could not be resolved by an IC miss handler.  Check if
 // it was a getter call and if there is an instance function with the same
 // name.  If so, create and return an implicit closure from the function.
 // Otherwise return null.
 static RawInstance* ResolveImplicitClosure(const Instance& receiver,
                                            const Class& receiver_class,
                                            const String& target_name) {
   // 1. Check if was a getter call.
   if (!Field::IsGetterName(target_name)) return Instance::null();
 
@@ skipping 13 matching lines @@
       Instance::Handle(Closure::New(closure_function, context));
   if (receiver_class.HasTypeArguments()) {
     const AbstractTypeArguments& type_arguments =
         AbstractTypeArguments::Handle(receiver.GetTypeArguments());
     closure.SetTypeArguments(type_arguments);
   }
   return closure.raw();
 }
 
 
-static RawObject* InvokeNoSuchMethod(const Instance& receiver,
-                                     const String& target_name,
-                                     const Array& arguments_descriptor,
-                                     const Array& arguments) {
-  // Allocate an InvocationMirror object.
-  const Library& core_lib = Library::Handle(Library::CoreLibrary());
-  const String& invocation_mirror_name =
-      String::Handle(Symbols::InvocationMirror());
-  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());
-  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_args));
-
-  // Now use the invocation mirror object and invoke NoSuchMethod.
-  const String& function_name = String::Handle(Symbols::NoSuchMethod());
-  const int kNumArguments = 2;
-  const int kNumNamedArguments = 0;
-  const Function& function = Function::Handle(
-      Resolver::ResolveDynamic(receiver,
-                               function_name,
-                               kNumArguments,
-                               kNumNamedArguments));
-  ASSERT(!function.IsNull());
-  const Array& args = Array::Handle(Array::New(kNumArguments));
-  args.SetAt(0, receiver);
-  args.SetAt(1, invocation_mirror);
-  const Object& result = Object::Handle(DartEntry::InvokeDynamic(function,
-                                                                 args));
-  CheckResultError(result);
-  return result.raw();
-}
-
-
-static RawObject* InvokeNonClosure(const Instance& receiver,
-                                   const Class& receiver_class,
-                                   const Array& arguments_descriptor,
-                                   const Array& arguments) {
-  // Resolve and invoke the "call" method if it exists.
-  const String& call_symbol = String::Handle(Symbols::Call());
-
-  Class& current_class = Class::Handle(receiver_class.raw());
-  Function& call_function = Function::Handle();
-  do {
-    call_function = current_class.LookupDynamicFunction(call_symbol);
-
-    if (!call_function.IsNull()) {
-      // The non-closure object is passed as implicit first argument
-      // (receiver).  It is already included in the arguments array.
-
-      // Now call the invoke stub which will invoke the call method.
-      const Object& result =
-          Object::Handle(DartEntry::InvokeDynamic(call_function,
-                                                  arguments,
-                                                  arguments_descriptor));
-      CheckResultError(result);
-      return result.raw();
-    }
-
-    current_class = current_class.SuperClass();
-  } while (!current_class.IsNull());
-
-  // There is no 'call' method, so invoke noSuchMethod.
-  return InvokeNoSuchMethod(receiver,
-                            call_symbol,
-                            arguments_descriptor,
-                            arguments);
-}
-
-
 // An instance call of the form o.f(...) could not be resolved.  Check if
 // there is a getter with the same name.  If so, invoke it.  If the value is
 // a closure, invoke it with the given arguments.  If the value is a
 // non-closure, attempt to invoke "call" on it.
 static bool ResolveCallThroughGetter(const Instance& receiver,
                                      const Class& receiver_class,
                                      const String& target_name,
                                      const Array& arguments_descriptor,
                                      const Array& arguments,
                                      Object* result) {
@@ skipping 10 matching lines @@
 
   // 2. Invoke the getter.
   const Array& args = Array::Handle(Array::New(kNumArguments));
   args.SetAt(0, receiver);
   const Object& value = Object::Handle(DartEntry::InvokeDynamic(getter, args));
 
   // 3. If the getter threw an exception, treat it as no such method.
   if (value.IsUnhandledException()) return false;
 
   // 4. If there was some other error, propagate it.
-  if (value.IsError()) {
-    Exceptions::PropagateError(Error::Cast(value));
-  }
+  CheckResultError(value);
 
-  // 5. If the value is a closure, invoke it and return the result.  If it
-  // is a non-closure, invoke "call" on it and return the result.
+  // 5. Invoke the value as a closure.
   Instance& instance = Instance::Handle();
   instance ^= value.raw();
-  const Class& instance_class = Class::Handle(instance.clazz());
-  ASSERT(!instance_class.IsNull());
-  // An object is a closure iff. its class has a non-null signature function.
-  if (instance_class.signature_function() != Function::null()) {
-    // The closure object is passed as implicit first argument to closure
-    // functions, since it may be needed to throw a NoSuchMethodError, in case
-    // the wrong number of arguments is passed.
-    // Replace the original receiver in the arguments array by the closure.
-    arguments.SetAt(0, instance);
-    *result = DartEntry::InvokeClosure(instance,
-                                       arguments,
-                                       arguments_descriptor);
-    CheckResultError(*result);
-  } else {
-    *result = InvokeNonClosure(instance,
-                               instance_class,
-                               arguments_descriptor,
-                               arguments);
-  }
+  arguments.SetAt(0, instance);
+  *result = DartEntry::InvokeClosure(instance,
+                                     arguments,
+                                     arguments_descriptor);
+  CheckResultError(*result);
   return true;
 }
 
 
-// Invoke appropriate noSuchMethod function.
-// Arg0: receiver.
-// Arg1: ic-data.
-// Arg2: arguments descriptor array.
-// Arg3: arguments array.
-DEFINE_RUNTIME_ENTRY(InvokeNoSuchMethodFunction, 4) {
-  ASSERT(arguments.ArgCount() ==
-         kInvokeNoSuchMethodFunctionRuntimeEntry.argument_count());
-  const Instance& receiver = Instance::CheckedHandle(arguments.ArgAt(0));
-  const ICData& ic_data = ICData::CheckedHandle(arguments.ArgAt(1));
-  const Array& orig_arguments_desc = Array::CheckedHandle(arguments.ArgAt(2));
-  const Array& orig_arguments = Array::CheckedHandle(arguments.ArgAt(3));
-
-  const String& original_function_name = String::Handle(ic_data.target_name());
-  const Object& result =
-      Object::Handle(InvokeNoSuchMethod(receiver,
-                                        original_function_name,
-                                        orig_arguments_desc,
-                                        orig_arguments));
-  arguments.SetReturn(result);
-}
-
-
-// A non-closure object was invoked as a closure, so call the "call" method
-// on it.
-// Arg0: non-closure object.
-// Arg1: arguments descriptor.
-// Arg2: arguments array, including non-closure object.
-DEFINE_RUNTIME_ENTRY(InvokeNonClosure, 3) {
-  ASSERT(arguments.ArgCount() ==
-         kInvokeNonClosureRuntimeEntry.argument_count());
-  const Instance& instance = Instance::CheckedHandle(arguments.ArgAt(0));
-  const Array& args_descriptor = Array::CheckedHandle(arguments.ArgAt(1));
-  const Array& function_args = Array::CheckedHandle(arguments.ArgAt(2));
-
-  const Class& instance_class = Class::Handle(instance.clazz());
-  const Object& result = Object::Handle(InvokeNonClosure(instance,
-                                                         instance_class,
-                                                         args_descriptor,
-                                                         function_args));
-  arguments.SetReturn(result);
-}
-
-
 // The IC miss handler has failed to find a (cacheable) instance function to
 // invoke.  Handle three possibilities:
 //
 // 1. If the call was a getter o.f, there may be an instance function with
 //    the same name.  If so, create an implicit closure and return it.
 //
 // 2. If the call was an instance call o.f(...), there may be a getter with
 //    the same name.  If so, invoke it.  If the value is a closure, invoke
 //    it with the given arguments.  If the value is a non-closure, attempt
 //    to invoke "call" on it.
@@ skipping 22 matching lines @@
     return;
   }
 
   Object& result = Object::Handle();
   if (!ResolveCallThroughGetter(receiver,
                                 receiver_class,
                                 target_name,
                                 args_descriptor,
                                 args,
                                 &result)) {
-    result = InvokeNoSuchMethod(receiver, target_name, args_descriptor, args);
+    result = DartEntry::InvokeNoSuchMethod(receiver,
+                                           target_name,
+                                           args,
+                                           args_descriptor);
   }
+  CheckResultError(result);
   arguments.SetReturn(result);
 }
 
 
 DEFINE_RUNTIME_ENTRY(StackOverflow, 0) {
   ASSERT(arguments.ArgCount() ==
          kStackOverflowRuntimeEntry.argument_count());
   uword stack_pos = reinterpret_cast<uword>(&arguments);
 
   // If an interrupt happens at the same time as a stack overflow, we
@@ skipping 523 matching lines @@
     return;
   }
   HeapTrace* heap_trace = Isolate::Current()->heap()->trace();
   heap_trace->TraceStoreIntoObject(RawObject::ToAddr(object),
                                    field_addr,
                                    RawObject::ToAddr(value));
 }
 END_LEAF_RUNTIME_ENTRY
 
 }  // namespace dart