Fix slow path for allocation of implicit closures (issue 613).

runtime/vm/stub_code_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"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/ic_data.h"
@@ skipping 1336 matching lines @@
     __ movl(ECX, Address(ESP, kTypeArgumentsOffset));
   }
   if (is_implicit_instance_closure) {
     __ movl(EAX, Address(ESP, kReceiverOffset));
   }
   // Create a stub frame.
   __ EnterFrame(0);
   const Closure& new_closure = Closure::ZoneHandle();
   __ PushObject(new_closure);  // Push Null closure for return value.
   __ PushObject(func);
-  if (has_type_arguments) {
-    __ pushl(ECX);  // Push type arguments of closure to be allocated.
-  } else {
-    __ pushl(raw_null);  // Push null type arguments.
-  }
   if (is_implicit_static_closure) {
     __ CallRuntimeFromStub(kAllocateImplicitStaticClosureRuntimeEntry);
-  } else if (is_implicit_instance_closure) {
-    __ pushl(EAX);  // Receiver.
-    __ CallRuntimeFromStub(kAllocateImplicitInstanceClosureRuntimeEntry);
-    __ popl(EAX);  // Pop receiver.
   } else {
-    ASSERT(func.IsNonImplicitClosureFunction());
-    __ CallRuntimeFromStub(kAllocateClosureRuntimeEntry);
+    if (is_implicit_instance_closure) {
+      __ pushl(EAX);  // Receiver.
+    }
+    if (has_type_arguments) {
+      __ pushl(ECX);  // Push type arguments of closure to be allocated.
+    } else {
+      __ pushl(raw_null);  // Push null type arguments.
+    }
+    if (is_implicit_instance_closure) {
+      __ CallRuntimeFromStub(kAllocateImplicitInstanceClosureRuntimeEntry);
+      __ popl(EAX);  // Pop argument (type arguments of object).
+      __ popl(EAX);  // Pop receiver.
+    } else {
+      ASSERT(func.IsNonImplicitClosureFunction());
+      __ CallRuntimeFromStub(kAllocateClosureRuntimeEntry);
+      __ popl(EAX);  // Pop argument (type arguments of object).
+    }
   }
-  __ popl(EAX);  // Pop argument (type arguments of object).
   __ popl(EAX);  // Pop function object.
   __ popl(EAX);
   // EAX: new object
   // Restore the frame pointer.
   __ LeaveFrame();
   __ ret();
 }
 
 
 // Called for invoking noSuchMethod function from the entry code of a dart
@@ skipping 140 matching lines @@
   // EAX: Target function.
   __ movl(EAX, FieldAddress(EAX, Function::code_offset()));
   __ movl(EAX, FieldAddress(EAX, Code::instructions_offset()));
   __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(EAX);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32