Set type argument vector at run time in instantiated closure objects.

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 1224 matching lines @@
   __ popl(EAX);  // Pop result (newly allocated object).
   // EAX: new object
   // Restore the frame pointer.
   __ LeaveFrame();
   __ ret();
 }
 
 
 // Called for inline allocation of closures.
 // Input parameters:
-//   ESP + 4 : receiver (only if non-static implicit closure).
+//   ESP + 8 : receiver (only if implicit instance closure).
+//   ESP + 4 : type arguments object (only if signature class is parameterized).
 //   ESP : points to return address.

[siva, 2011/10/13 20:52:21]

if signature class is not parameterized  ESP + 4 will be the receiver right,
maybe we should document that?

[regis, 2011/10/13 21:33:46]

Done.

 // Uses EAX, EBX, ECX, EDX as temporary registers.
 void StubCode::GenerateAllocationStubForClosure(Assembler* assembler,
                                                 const Function& func) {
-  const intptr_t kReceiverOffset = 1 * kWordSize;
   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.IsParameterized();
+  const intptr_t kTypeArgumentsOffset = 1 * kWordSize;
+  const intptr_t kReceiverOffset = (is_cls_parameterized ? 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)) {
-    const Class& cls = Class::ZoneHandle(func.signature_class());
     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.
       __ addl(EBX, Immediate(context_size));
     }
     // Check if the allocation fits into the remaining space.
     // EAX: potential new closure object.
@@ skipping 47 matching lines @@
       // Initialize the context variable to the receiver.
       __ movl(EDX, Address(ESP, kReceiverOffset));
       __ 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) {
+      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);
 
-    // TODO(regis): Store the actual type arguments.
-    __ movl(Address(EAX, Closure::type_arguments_offset()), raw_null);
-
     // Done allocating and initializing the instance.
     // EAX: new object.
     __ addl(EAX, Immediate(kHeapObjectTag));
     __ ret();
 
     __ Bind(&slow_case);
   }
+  if (is_cls_parameterized) {
+    __ 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) {
+    __ pushl(ECX);  // Push type arguments of closure to be allocated.
+  } else {
+    __ PushObject(TypeArguments::ZoneHandle());  // Push null type arguments.

[siva, 2011/10/13 20:52:21]

why not use pushl(raw_null) here?

[regis, 2011/10/13 21:33:46]

Done here and at some other locations.

+  }
   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);
   }
+  __ 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 16 matching lines @@
   // noSuchMethod(String name, Array arguments) to something like
   // noSuchMethod(InvocationMirror call).
   // Also, the class NoSuchMethodException has to be modified accordingly.
   // Total number of args is the first Smi in args descriptor array (EDX).
   __ movl(EDI, FieldAddress(EDX, Array::data_offset()));
   __ SmiUntag(EDI);
   __ movl(EAX, Address(EBP, EDI, TIMES_4, kWordSize));  // Get receiver.
 
   __ EnterFrame(0);
   // Setup space for return value on stack by pushing smi 0.
-  // TODO(regis): Why are we using smi 0 instead of raw_null in stubs?
   __ pushl(Immediate(0));  // Result from noSuchMethod.
   __ pushl(EAX);  // Receiver.
   __ pushl(ECX);  // Function name.
   __ pushl(EDX);  // Arguments descriptor array.
   __ subl(EDI, Immediate(1));  // Arguments array length, minus the receiver.
   // See stack layout below explaining "wordSize * 8" offset.
   PushArgumentsArray(assembler, (kWordSize * 8));
 
   // Stack:
   // TOS + 0: Argument array.
@@ skipping 16 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