Faster invocation of fields as methods.

runtime/vm/code_generator.cc

 // Copyright (c) 2013, 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.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
@@ skipping 1166 matching lines @@
 
 // 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,
+                                     const ICData& ic_data,
                                      Object* result) {
   // 1. Check if there is a getter with the same name.
   const String& getter_name = String::Handle(Field::GetterName(target_name));
   const int kNumArguments = 1;
   const int kNumNamedArguments = 0;
   const Function& getter = Function::Handle(
       Resolver::ResolveDynamicForReceiverClass(receiver_class,
                                                getter_name,
                                                kNumArguments,
                                                kNumNamedArguments));
   if (getter.IsNull() || getter.IsMethodExtractor()) {
     return false;
   }
 
-  // 2. Invoke the getter.
-  const Array& args = Array::Handle(Array::New(kNumArguments));
-  args.SetAt(0, receiver);
-  const Object& value = Object::Handle(DartEntry::InvokeFunction(getter, args));
-
-  // 3. If there was some error, propagate it.
-  CheckResultError(value);
-
-  // 4. Invoke the value as a closure.
-  Instance& instance = Instance::Handle();
-  instance ^= value.raw();
-  arguments.SetAt(0, instance);
-  *result = DartEntry::InvokeClosure(arguments, arguments_descriptor);
+  const Function& target_function =
+      Function::Handle(receiver_class.GetInvocationDispatcher(
+          target_name,
+          arguments_descriptor,
+          RawFunction::kInvokeFieldDispatcher));
+  // Update IC data.
+  ASSERT(!target_function.IsNull());
+  ic_data.AddReceiverCheck(receiver.GetClassId(), target_function);
+  if (FLAG_trace_ic) {
+    OS::PrintErr("InvokeField IC miss: adding <%s> id:%"Pd" -> <%s>\n",
+        Class::Handle(receiver.clazz()).ToCString(),
+        receiver.GetClassId(),
+        target_function.ToCString());
+  }
+  *result = DartEntry::InvokeFunction(target_function,
+                                      arguments,
+                                      arguments_descriptor);
   CheckResultError(*result);
   return true;
 }
 
 
 // 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.
@@ skipping 18 matching lines @@
     receiver_class = isolate->object_store()->object_class();
   }
   const String& target_name = String::Handle(ic_data.target_name());
 
   Object& result = Object::Handle();
   if (!ResolveCallThroughGetter(receiver,
                                 receiver_class,
                                 target_name,
                                 args_descriptor,
                                 args,
+                                ic_data,
                                 &result)) {
     ArgumentsDescriptor desc(args_descriptor);
-    const Function& target_function = Function::Handle(
-        receiver_class.GetNoSuchMethodDispatcher(target_name, args_descriptor));
+    const Function& target_function =
+        Function::Handle(receiver_class.GetInvocationDispatcher(
+            target_name,
+            args_descriptor,
+            RawFunction::kNoSuchMethodDispatcher));
     // Update IC data.
     ASSERT(!target_function.IsNull());
     intptr_t receiver_cid = receiver.GetClassId();
     if (ic_data.num_args_tested() == 1) {
       // In optimized code we may enter into here via the
       // MegamorphicCacheMissHandler since noSuchMethod dispatchers are not
       // inserted into the megamorphic cache. Therefore, we need to guard
       // against entering the same check twice into the ICData.
       // Note that num_args_tested == 1 in optimized code.
       // TODO(fschneider): Handle extraordinary cases like noSuchMethod and
@@ skipping 616 matching lines @@
 //   Arg1: Value that is being stored.
 DEFINE_RUNTIME_ENTRY(UpdateFieldCid, 2) {
   ASSERT(arguments.ArgCount() == kUpdateFieldCidRuntimeEntry.argument_count());
   const Field& field = Field::CheckedHandle(arguments.ArgAt(0));
   const Object& value = Object::Handle(arguments.ArgAt(1));
 
   field.UpdateCid(value.GetClassId());
 }
 
 }  // namespace dart