Alternative fix for .call invocation of closures.

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 1008 matching lines @@
 
   Object& result = Object::Handle();
   if (!ResolveCallThroughGetter(receiver,
                                 receiver_class,
                                 target_name,
                                 args_descriptor,
                                 args,
                                 ic_data,
                                 &result)) {
     ArgumentsDescriptor desc(args_descriptor);
-    Function& target_function = Function::Handle();
-    if (receiver.IsClosure() && target_name.Equals(Symbols::Call())) {
-      target_function = receiver_class.GetInvocationDispatcher(
-          target_name,
-          args_descriptor,
-          RawFunction::kInvokeClosureDispatcher);
-    } else {
-      target_function = receiver_class.GetInvocationDispatcher(
-          target_name,
-          args_descriptor,
-          RawFunction::kNoSuchMethodDispatcher);
-    }
+    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 504 matching lines @@
 // of the given value.
 //   Arg0: Field object;
 //   Arg1: Value that is being stored.
 DEFINE_RUNTIME_ENTRY(UpdateFieldCid, 2) {
   const Field& field = Field::CheckedHandle(arguments.ArgAt(0));
   const Object& value = Object::Handle(arguments.ArgAt(1));
   field.UpdateGuardedCidAndLength(value);
 }
 
 }  // namespace dart