Address review comments of previously submitted cl 8329005.

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/object_store.h"
@@ skipping 1240 matching lines @@
 void StubCode::GenerateAllocationStubForClosure(Assembler* assembler,
                                                 const Function& func) {
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
   ASSERT(func.IsClosureFunction());
   const bool is_implicit_static_closure =
       func.IsImplicitStaticClosureFunction();
   const bool is_implicit_instance_closure =
       func.IsImplicitInstanceClosureFunction();
   const Class& cls = Class::ZoneHandle(func.signature_class());
-  const bool is_cls_parameterized = cls.NumTypeArguments() > 0;
+  const bool has_type_arguments = cls.HasTypeArguments();
   const intptr_t kTypeArgumentsOffset = 1 * kWordSize;
-  const intptr_t kReceiverOffset = (is_cls_parameterized ? 2 : 1) * kWordSize;
+  const intptr_t kReceiverOffset = (has_type_arguments ? 2 : 1) * kWordSize;
   const intptr_t closure_size = Closure::InstanceSize();
   const intptr_t context_size = Context::InstanceSize(1);  // Captured receiver.
   if (FLAG_inline_alloc &&
       PageSpace::IsPageAllocatableSize(closure_size + context_size)) {
     Label slow_case;
     Heap* heap = Isolate::Current()->heap();
     __ movl(EAX, Address::Absolute(heap->TopAddress()));
     __ leal(EBX, Address(EAX, closure_size));
     if (is_implicit_instance_closure) {
       __ movl(ECX, EBX);  // ECX: new context address.
@@ skipping 53 matching lines @@
       __ movl(Address(ECX, Context::variable_offset(0)), EDX);
 
       // Set the newly allocated context in the newly allocated closure.
       __ addl(ECX, Immediate(kHeapObjectTag));
       __ movl(Address(EAX, Closure::context_offset()), ECX);
     } else {
       __ movl(Address(EAX, Closure::context_offset()), CTX);
     }
 
     // Set the type arguments field in the newly allocated closure.
-    if (is_cls_parameterized) {
+    if (has_type_arguments) {
       ASSERT(!is_implicit_static_closure);
       // Use the passed-in type arguments.
       __ movl(EDX, Address(ESP, kTypeArgumentsOffset));
       __ movl(Address(EAX, Closure::type_arguments_offset()), EDX);
     } else {
       // Set to null.
       __ movl(Address(EAX, Closure::type_arguments_offset()), raw_null);
     }
 
     __ movl(Address(EAX, Closure::smrck_offset()), raw_null);
 
     // Done allocating and initializing the instance.
     // EAX: new object.
     __ addl(EAX, Immediate(kHeapObjectTag));
     __ ret();
 
     __ Bind(&slow_case);
   }
-  if (is_cls_parameterized) {
+  if (has_type_arguments) {
     __ 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 (is_cls_parameterized) {
+  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.
@@ skipping 67 matching lines @@
   __ popl(EAX);  // Get result into EAX.
 
   // Remove the stub frame as we are about to return.
   __ LeaveFrame();
   __ ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32