Inline allocation of implicit closures.

runtime/vm/code_generator_ia32.cc

 // Copyright (c) 2011, 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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 831 matching lines @@
   // Type nodes are handled specially by the code generator.
   UNREACHABLE();
 }
 
 
 void CodeGenerator::VisitClosureNode(ClosureNode* node) {
   const int current_context_level = state()->context_level();
   const ContextScope& context_scope = ContextScope::ZoneHandle(
       node->scope()->PreserveOuterScope(current_context_level));
   const Function& function = node->function();
+  ASSERT(function.IsClosureFunction() && !function.IsImplicitClosureFunction());
   ASSERT(!function.HasCode());
   ASSERT(function.context_scope() == ContextScope::null());
   function.set_context_scope(context_scope);
   const Code& stub = Code::Handle(
       StubCode::GetAllocationStubForClosure(function));
   const ExternalLabel label(function.ToCString(), stub.EntryPoint());
   GenerateCall(node->token_index(), &label);
   if (IsResultNeeded(node)) {
     __ pushl(EAX);
   }
 }
 
 
 void CodeGenerator::VisitStaticImplicitClosureNode(
     StaticImplicitClosureNode* node) {
   const Function& function = node->function();
+  ASSERT(function.IsImplicitClosureFunction());
+  ASSERT(function.is_static());
   ASSERT(function.context_scope() != ContextScope::null());
   const Code& stub = Code::Handle(
-      StubCode::GetAllocationStubForStaticImplicitClosure(function));
+      StubCode::GetAllocationStubForClosure(function));
   const ExternalLabel label(function.ToCString(), stub.EntryPoint());
   GenerateCall(node->token_index(), &label);
   if (IsResultNeeded(node)) {
     __ pushl(EAX);
   }
 }
 
 
 void CodeGenerator::VisitImplicitClosureNode(ImplicitClosureNode* node) {
   const Function& function = node->function();
+  ASSERT(function.IsImplicitClosureFunction());
+  ASSERT(!function.is_static());
   ASSERT(function.context_scope() != ContextScope::null());
-  const Immediate raw_null =
-      Immediate(reinterpret_cast<intptr_t>(Object::null()));
-  Label null_receiver;
   node->receiver()->Visit(this);
-  __ popl(EAX);  // Get receiver.
-  const Object& result = Object::ZoneHandle();
-  __ PushObject(result);  // Make room for the result of the runtime call.
-  __ PushObject(function);  // Push the type.
-  __ pushl(EAX);  // Push the receiver.
-  GenerateCallRuntime(node->token_index(),
-                      kAllocateImplicitClosureRuntimeEntry);
-  // Pop the parameters supplied to the runtime entry. The result of the
-  // type check runtime call is the checked value.
-  __ addl(ESP, Immediate(2 * kWordSize));
-  __ popl(EAX);  // Allocated closure.
+  const Code& stub = Code::Handle(
+      StubCode::GetAllocationStubForClosure(function));
+  const ExternalLabel label(function.ToCString(), stub.EntryPoint());
+  GenerateCall(node->token_index(), &label);
+  __ popl(ECX);  // Pop receiver.
   if (IsResultNeeded(node)) {
     __ pushl(EAX);
   }
 }
 
 
 void CodeGenerator::VisitPrimaryNode(PrimaryNode* node) {
   // PrimaryNodes are temporary during parsing.
   ErrorMsg(node->token_index(),
       "Unexpected primary node: %s", node->primary().ToCString());
@@ skipping 1755 matching lines @@
   const Class& cls = Class::Handle(parsed_function_.function().owner());
   const Script& script = Script::Handle(cls.script());
   Parser::ReportMsg(script, token_index, "Error", error_msg, format, args);
   Isolate::Current()->long_jump_base()->Jump(1, error_msg);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32