VM: Simplify dispatcher code for closure calls.

runtime/vm/parser.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/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "platform/utils.h"
 #include "vm/ast_transformer.h"
 #include "vm/bootstrap.h"
@@ skipping 1414 matching lines @@
   ASSERT(desc.Count() > 0);
 
   // Set up scope for this function.
   BuildDispatcherScope(func, desc, default_values);
 
   // Receiver is local 0.
   LocalScope* scope = current_block_->scope;
   ArgumentListNode* no_args = new ArgumentListNode(token_pos);
   LoadLocalNode* receiver = new LoadLocalNode(token_pos, scope->VariableAt(0));
 
+  const Class& owner = Class::Handle(Z, func.Owner());
+  ASSERT(!owner.IsNull());
   const String& name = String::Handle(Z, func.name());
-  const String& getter_name = String::ZoneHandle(Z,
-      Symbols::New(String::Handle(Z, Field::GetterName(name))));
-  InstanceCallNode* getter_call = new(Z) InstanceCallNode(
-      token_pos, receiver, getter_name, no_args);
+  AstNode* function_object = NULL;
+  if (owner.IsSignatureClass() && name.Equals(Symbols::Call())) {
+    function_object = receiver;
+  } else {
+    const String& getter_name = String::ZoneHandle(Z,
+        Symbols::New(String::Handle(Z, Field::GetterName(name))));
+    function_object = new(Z) InstanceCallNode(
+        token_pos, receiver, getter_name, no_args);
+  }
 
   // Pass arguments 1..n to the closure call.
   ArgumentListNode* args = new(Z) ArgumentListNode(token_pos);
   const Array& names = Array::Handle(
       Z, Array::New(desc.NamedCount(), Heap::kOld));
   // Positional parameters.
   intptr_t i = 1;
   for (; i < desc.PositionalCount(); ++i) {
     args->Add(new LoadLocalNode(token_pos, scope->VariableAt(i)));
   }
   // Named parameters.
   for (; i < desc.Count(); i++) {
     args->Add(new(Z) LoadLocalNode(token_pos, scope->VariableAt(i)));
     intptr_t index = i - desc.PositionalCount();
     names.SetAt(index, String::Handle(Z, desc.NameAt(index)));
   }
   args->set_names(names);
 
-  const Class& owner = Class::Handle(Z, func.Owner());
-  ASSERT(!owner.IsNull());
   AstNode* result = NULL;
   if (owner.IsSignatureClass() && name.Equals(Symbols::Call())) {
-    result = new ClosureCallNode(token_pos, getter_call, args);
+    result = new ClosureCallNode(token_pos, function_object, args);
   } else {
-    result = BuildClosureCall(token_pos, getter_call, args);
+    result = BuildClosureCall(token_pos, function_object, args);
   }
 
   ReturnNode* return_node = new ReturnNode(token_pos, result);
   current_block_->statements->Add(return_node);
   return CloseBlock();
 }
 
 
 AstNode* Parser::BuildClosureCall(intptr_t token_pos,
                                   AstNode* closure,
@@ skipping 10749 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart