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

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 836 matching lines @@
 
 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.IsNonImplicitClosureFunction());
   ASSERT(!function.HasCode());
   ASSERT(function.context_scope() == ContextScope::null());
   function.set_context_scope(context_scope);
+  // The function type of a closure may be parameterized. In that case, pass
+  // the type arguments of the instantiator.
+  const Class& cls = Class::Handle(function.signature_class());
+  ASSERT(!cls.IsNull());
+  const bool is_cls_parameterized = cls.IsParameterized();
+  if (is_cls_parameterized) {
+    GenerateInstantiatorTypeArguments();
+  }
   const Code& stub = Code::Handle(
       StubCode::GetAllocationStubForClosure(function));
   const ExternalLabel label(function.ToCString(), stub.EntryPoint());
   GenerateCall(node->token_index(), &label);
+  if (is_cls_parameterized) {
+    __ popl(ECX);  // Pop type arguments.
+  }
   if (IsResultNeeded(node)) {
     __ pushl(EAX);
   }
 }
 
 
 void CodeGenerator::VisitImplicitStaticClosureNode(
     ImplicitStaticClosureNode* node) {
   const Function& function = node->function();
   ASSERT(function.IsImplicitStaticClosureFunction());
   ASSERT(function.context_scope() != ContextScope::null());
   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::VisitImplicitInstanceClosureNode(
     ImplicitInstanceClosureNode* node) {
   const Function& function = node->function();
   ASSERT(function.IsImplicitInstanceClosureFunction());
   ASSERT(function.context_scope() != ContextScope::null());
   node->receiver()->Visit(this);
+  // The function type of a closure may be parameterized. In that case, pass
+  // the type arguments of the instantiator.
+  const Class& cls = Class::Handle(function.signature_class());
+  ASSERT(!cls.IsNull());
+  const bool is_cls_parameterized = cls.IsParameterized();
+  if (is_cls_parameterized) {
+    GenerateInstantiatorTypeArguments();
+  }
   const Code& stub = Code::Handle(
       StubCode::GetAllocationStubForClosure(function));
   const ExternalLabel label(function.ToCString(), stub.EntryPoint());
   GenerateCall(node->token_index(), &label);
+  if (is_cls_parameterized) {
+    __ popl(ECX);  // Pop type arguments.
+  }
   __ popl(ECX);  // Pop receiver.

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

The code for VisitClosureNode and VisitImplicitInstanceClosureNode seem
identical in the middle, I am wondering if it be worth making a static method of
the common code.

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

I tried to factorize the visiting code of all 3 closure flavors, but it gets
harder to read.

Even for the 2 instance flavors, many parameters need to be passed to the common
function, since the 2 ast node types are unrelated.

At this point, it would make sense to consolidate all 3 ast nodes into a single
one, For now. I will leave it as is.

Added TODO.

   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 526 matching lines @@
         __ jmp(&done, Assembler::kNearJump);
         __ Bind(&runtime_call);
       }
     }
   }
   const Object& result = Object::ZoneHandle();
   __ PushObject(result);  // Make room for the result of the runtime call.
   __ pushl(EAX);  // Push the instance.
   __ PushObject(type);  // Push the type.
   if (!type.IsInstantiated()) {
-    ASSERT(parsed_function().instantiator() != NULL);
-    parsed_function().instantiator()->Visit(this);  // Instantiator on stack.
-    if (!parsed_function().function().IsInFactoryScope()) {
-      __ popl(EAX);  // Pop instantiator.
-      const Class& instantiator_class =
-          Class::Handle(parsed_function().function().owner());
-      // The instantiator is the receiver of the caller, which is not a factory.
-      // The receiver cannot be null; extract its TypeArguments object.
-      // Note that in the factory case, the instantiator is the first parameter
-      // of the factory, i.e. already a TypeArguments object.
-      intptr_t type_arguments_instance_field_offset =
-          instantiator_class.type_arguments_instance_field_offset();
-      ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
-      __ movl(EAX, FieldAddress(EAX, type_arguments_instance_field_offset));
-      __ pushl(EAX);  // Push instantiator.
-    }
+    GenerateInstantiatorTypeArguments();
   } else {
     __ PushObject(TypeArguments::ZoneHandle());  // Null instantiator.
   }
   GenerateCallRuntime(token_index, kInstanceofRuntimeEntry);
   // Pop the two parameters supplied to the runtime entry. The result of the
   // instanceof runtime call will be left as the result of the operation.
   __ addl(ESP, Immediate(3 * kWordSize));
   if (negate_result) {
     Label negate_done;
     __ popl(EDX);
@@ skipping 136 matching lines @@
   }
   __ Bind(&runtime_call);
   const Object& result = Object::ZoneHandle();
   __ PushObject(result);  // Make room for the result of the runtime call.
   const Immediate location =
       Immediate(reinterpret_cast<int32_t>(Smi::New(token_index)));
   __ pushl(location);  // Push the source location.
   __ pushl(EAX);  // Push the source object.
   __ PushObject(dst_type);  // Push the type of the destination.
   if (!dst_type.IsInstantiated()) {
-    ASSERT(parsed_function().instantiator() != NULL);
-    parsed_function().instantiator()->Visit(this);  // Instantiator on stack.
-    if (!parsed_function().function().IsInFactoryScope()) {
-      __ popl(EAX);  // Pop instantiator.
-      const Class& instantiator_class =
-          Class::Handle(parsed_function().function().owner());
-      // The instantiator is the receiver of the caller, which is not a factory.
-      // The receiver cannot be null; extract its TypeArguments object.
-      // Note that in the factory case, the instantiator is the first parameter
-      // of the factory, i.e. already a TypeArguments object.
-      intptr_t type_arguments_instance_field_offset =
-          instantiator_class.type_arguments_instance_field_offset();
-      ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
-      __ movl(EAX, FieldAddress(EAX, type_arguments_instance_field_offset));
-      __ pushl(EAX);  // Push instantiator.
-    }
+    GenerateInstantiatorTypeArguments();
   } else {
     __ PushObject(TypeArguments::ZoneHandle());  // Null instantiator.
   }
   __ PushObject(dst_name);  // Push the name of the destination.
   GenerateCallRuntime(token_index, kTypeCheckRuntimeEntry);
   // Pop the parameters supplied to the runtime entry. The result of the
   // type check runtime call is the checked value.
   __ addl(ESP, Immediate(5 * kWordSize));
   __ popl(EAX);
 
@@ skipping 561 matching lines @@
   __ addl(ESP, Immediate((node->arguments()->length() + 1) * kWordSize));
   // Restore the context.
   __ popl(CTX);
   // Result is in EAX.
   if (IsResultNeeded(node)) {
     __ pushl(EAX);
   }
 }
 
 
+// Pushes the type arguments of the instantiator on the stack.
+void CodeGenerator::GenerateInstantiatorTypeArguments() {
+  ASSERT(parsed_function().instantiator() != NULL);
+  parsed_function().instantiator()->Visit(this);
+  if (!parsed_function().function().IsInFactoryScope()) {
+    __ popl(EAX);  // Pop instantiator.
+    const Class& instantiator_class =
+        Class::Handle(parsed_function().function().owner());
+    // The instantiator is the receiver of the caller, which is not a factory.
+    // The receiver cannot be null; extract its TypeArguments object.
+    // Note that in the factory case, the instantiator is the first parameter
+    // of the factory, i.e. already a TypeArguments object.
+    intptr_t type_arguments_instance_field_offset =
+        instantiator_class.type_arguments_instance_field_offset();
+    ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
+    __ movl(EAX, FieldAddress(EAX, type_arguments_instance_field_offset));
+    __ pushl(EAX);
+  }
+}
+
+
 // Pushes the type arguments on the stack in preparation of a constructor or
 // factory call.
 // For a factory call, instantiates (possibly requiring an additional run time
 // call) and pushes the type argument vector that will be passed as implicit
 // first parameter to the factory.
 // For a constructor call allocating an object of a parameterized class, pushes
 // the type arguments and the type arguments of the instantiator, without ever
 // generating an additional run time call.
 // Does nothing for a constructor call allocating an object of a non
 // parameterized class.
 // Note that a class without proper type parameters may still be parameterized,
 // e.g. class A extends Array<int>.
 void CodeGenerator::GenerateTypeArguments(ConstructorCallNode* node,
                                           bool is_cls_parameterized) {
   // Instantiate the type arguments if necessary.
   if (node->type_arguments().IsNull() ||
       node->type_arguments().IsInstantiated()) {
     if (node->constructor().IsFactory() || is_cls_parameterized) {
       // A factory requires the type arguments as first parameter.
       __ PushObject(node->type_arguments());
       if (!node->constructor().IsFactory()) {
         // The allocator additionally requires the instantiator type arguments.
         __ PushObject(TypeArguments::ZoneHandle());  // Null instantiator.
       }
     }
   } else {
     // The type arguments are uninstantiated.
-    ASSERT(parsed_function().instantiator() != NULL);
     ASSERT(node->constructor().IsFactory() || is_cls_parameterized);
-    parsed_function().instantiator()->Visit(this);
-    __ popl(EAX);  // Pop instantiator.
-    if (!parsed_function().function().IsInFactoryScope()) {
-      const Class& instantiator_class =
-          Class::Handle(parsed_function().function().owner());
-      // The instantiator is the receiver of the caller, which is not a factory.
-      // The receiver cannot be null; extract its TypeArguments object.
-      // Note that in the factory case, the instantiator is the first parameter
-      // of the factory, i.e. already a TypeArguments object.
-      intptr_t type_arguments_instance_field_offset =
-          instantiator_class.type_arguments_instance_field_offset();
-      ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
-      __ movl(EAX, FieldAddress(EAX, type_arguments_instance_field_offset));
-    }
+    GenerateInstantiatorTypeArguments();
+    __ popl(EAX);

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

// Pop instantiator.

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

Done.

     // EAX is the instantiator TypeArguments object (or null).
     // If EAX is null, no need to instantiate the type arguments, use null, and
     // allocate an object of a raw type.
     Label type_arguments_instantiated, type_arguments_uninstantiated;
     const Immediate raw_null =
         Immediate(reinterpret_cast<intptr_t>(Object::null()));
     __ cmpl(EAX, raw_null);
     __ j(EQUAL, &type_arguments_instantiated, Assembler::kNearJump);
 
     // Instantiate non-null type arguments.
@@ skipping 397 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