Properly set the element type of literal lists.

runtime/vm/code_generator_x64.cc

 // Copyright (c) 2012, 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_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
@@ skipping 852 matching lines @@
 }
 
 
 void CodeGenerator::VisitArrayNode(ArrayNode* node) {
   // Evaluate the array elements.
   for (int i = 0; i < node->length(); i++) {
     AstNode* element = node->ElementAt(i);
     element->Visit(this);
   }
 
+  const AbstractTypeArguments& element_type = node->type_arguments();
+  const bool instantiate_type_arguments =  true;
+  GenerateTypeArguments(node->id(),
+                        node->token_index(),
+                        element_type,
+                        instantiate_type_arguments);
+  __ popq(RBX);
+  __ movq(R10, Immediate(Smi::RawValue(node->length())));
+
   // Allocate the array.
   //   R10 : Array length as Smi.
   //   RBX : element type for the array.
-  __ movq(R10, Immediate(Smi::RawValue(node->length())));
-  const AbstractTypeArguments& element_type = node->type_arguments();
-  ASSERT(element_type.IsNull() || element_type.IsInstantiated());
-  __ LoadObject(RBX, element_type);
   GenerateCall(node->token_index(),
                &StubCode::AllocateArrayLabel(),
                PcDescriptors::kOther);
 
   // Pop the element values from the stack into the array.
   __ leaq(RCX, FieldAddress(RAX, Array::data_offset()));
   for (int i = node->length() - 1; i >= 0; i--) {
     __ popq(Address(RCX, i * kWordSize));
   }
 
@@ skipping 1255 matching lines @@
       intptr_t type_arguments_instance_field_offset =
           instantiator_class.type_arguments_instance_field_offset();
       ASSERT(type_arguments_instance_field_offset != Class::kNoTypeArguments);
       __ movq(RAX, FieldAddress(RAX, type_arguments_instance_field_offset));
       __ pushq(RAX);
     }
   }
 }
 
 
-// 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 requires_type_arguments) {
+// Pushes the type arguments on the stack in preparation of an allocation call.
+// If instantiate_type_arguments is true, the instantiated type arguments
+// are pushed on the stack (after an instantiation run time call, if necessary).
+// If instantiate_type_arguments is false, the (possibly uninstantiated) type
+// arguments are pushed on the stack, as well as the type arguments of the
+// instantiator (or the special kNoInstantiator Smi marker, if the type
+// arguments are instantiated).
+void CodeGenerator::GenerateTypeArguments(
+    intptr_t node_id,
+    intptr_t token_index,
+    const AbstractTypeArguments& type_arguments,
+    bool instantiate_type_arguments) {
   const Immediate raw_null =
       Immediate(reinterpret_cast<intptr_t>(Object::null()));
-  // Instantiate the type arguments if necessary.
-  if (node->type_arguments().IsNull() ||
-      node->type_arguments().IsInstantiated()) {
-    if (requires_type_arguments) {
-      // A factory requires the type arguments as first parameter.
-      __ PushObject(node->type_arguments());
-      if (!node->constructor().IsFactory()) {
-        // The non-factory allocator additionally requires the instantiator
-        // type arguments which are not needed here, since the type arguments
-        // are instantiated.
-        __ pushq(Immediate(Smi::RawValue(StubCode::kNoInstantiator)));
-      }
+  if (type_arguments.IsNull() || type_arguments.IsInstantiated()) {
+    // The type arguments are instantiated.
+    __ PushObject(type_arguments);
+    if (!instantiate_type_arguments) {
+      // The type arguments of the instantiator are not needed, since the
+      // type arguments are instantiated.
+      __ pushq(Immediate(Smi::RawValue(StubCode::kNoInstantiator)));
     }
   } else {
     // The type arguments are uninstantiated.
-    ASSERT(requires_type_arguments);
-    GenerateInstantiatorTypeArguments(node->token_index());
+    GenerateInstantiatorTypeArguments(token_index);
     __ popq(RAX);  // Pop instantiator.
     // RAX is the instantiator AbstractTypeArguments object (or null).
     // If the instantiator is null and if the type argument vector
     // instantiated from null becomes a vector of Dynamic, then use null as
     // the type arguments.
     Label type_arguments_instantiated;
-    const intptr_t len = node->type_arguments().Length();
-    if (node->type_arguments().IsRawInstantiatedRaw(len)) {
+    const intptr_t len = type_arguments.Length();
+    if (type_arguments.IsRawInstantiatedRaw(len)) {
       __ cmpq(RAX, raw_null);
       __ j(EQUAL, &type_arguments_instantiated, Assembler::kNearJump);
     }
     // Instantiate non-null type arguments.
-    if (node->type_arguments().IsUninstantiatedIdentity()) {
+    if (type_arguments.IsUninstantiatedIdentity()) {
       // Check if the instantiator type argument vector is a TypeArguments of a
       // matching length and, if so, use it as the instantiated type_arguments.
       // No need to check RAX for null (again), because a null instance will
       // have the wrong class (Null instead of TypeArguments).
       Label type_arguments_uninstantiated;
       __ LoadObject(RCX, Class::ZoneHandle(Object::type_arguments_class()));
       __ cmpq(RCX, FieldAddress(RAX, Object::class_offset()));
       __ j(NOT_EQUAL, &type_arguments_uninstantiated, Assembler::kNearJump);
-      Immediate arguments_length =
-          Immediate(Smi::RawValue(node->type_arguments().Length()));
       __ cmpq(FieldAddress(RAX, TypeArguments::length_offset()),
-          arguments_length);
+              Immediate(Smi::RawValue(len)));
       __ j(EQUAL, &type_arguments_instantiated, Assembler::kNearJump);
       __ Bind(&type_arguments_uninstantiated);
     }
-    if (node->constructor().IsFactory()) {
-      // A runtime call to instantiate the type arguments is required before
-      // calling the factory.
+    if (instantiate_type_arguments) {
+      // A runtime call to instantiate the type arguments is required.
       __ PushObject(Object::ZoneHandle());  // Make room for the result.
-      __ PushObject(node->type_arguments());
+      __ PushObject(type_arguments);
       __ pushq(RAX);  // Push instantiator type arguments.
-      GenerateCallRuntime(node->id(),
-                          node->token_index(),
+      GenerateCallRuntime(node_id,
+                          token_index,
                           kInstantiateTypeArgumentsRuntimeEntry);
       __ popq(RAX);  // Pop instantiator type arguments.
       __ popq(RAX);  // Pop uninstantiated type arguments.
       __ popq(RAX);  // Pop instantiated type arguments.
       __ Bind(&type_arguments_instantiated);
       __ pushq(RAX);  // Instantiated type arguments.
     } else {
-      // In the non-factory case, we rely on the allocation stub to
-      // instantiate the type arguments.
-      __ PushObject(node->type_arguments());
+      // The allocation stub will instantiate the type arguments.
+      __ PushObject(type_arguments);
       __ pushq(RAX);  // Instantiator type arguments.
       Label type_arguments_pushed;
       __ jmp(&type_arguments_pushed, Assembler::kNearJump);
 
       __ Bind(&type_arguments_instantiated);
       __ pushq(RAX);  // Instantiated type arguments.
       __ pushq(Immediate(Smi::RawValue(StubCode::kNoInstantiator)));
       __ Bind(&type_arguments_pushed);
     }
   }
 }
 
 
 void CodeGenerator::VisitConstructorCallNode(ConstructorCallNode* node) {
   if (node->constructor().IsFactory()) {
-    const bool requires_type_arguments = true;  // Always first arg to factory.
-    GenerateTypeArguments(node, requires_type_arguments);
+    const bool instantiate_type_arguments = true;  // First argument to factory.
+    GenerateTypeArguments(node->id(),
+                          node->token_index(),
+                          node->type_arguments(),
+                          instantiate_type_arguments);
     // The top of stack is an instantiated AbstractTypeArguments object
     // (or null).
     int num_args = node->arguments()->length() + 1;  // +1 to include type args.
     node->arguments()->Visit(this);
     // Call the factory.
     __ LoadObject(RBX, node->constructor());
     __ LoadObject(R10, ArgumentsDescriptor(num_args,
                                            node->arguments()->names()));
     GenerateCall(node->token_index(),
                  &StubCode::CallStaticFunctionLabel(),
                  PcDescriptors::kFuncCall);
     // Factory constructor returns object in RAX.
     __ addq(RSP, Immediate(num_args * kWordSize));
     if (IsResultNeeded(node)) {
       __ pushq(RAX);
     }
     return;
   }
 
   const Class& cls = Class::ZoneHandle(node->constructor().owner());
   const bool requires_type_arguments = cls.HasTypeArguments();
-  GenerateTypeArguments(node, requires_type_arguments);
+  const bool instantiate_type_arguments = false;  // Done in stub or runtime.
+  if (requires_type_arguments) {
+    GenerateTypeArguments(node->id(),
+                          node->token_index(),
+                          node->type_arguments(),
+                          instantiate_type_arguments);
+  }
 
   // If cls is parameterized, the type arguments and the instantiator's
   // type arguments are on the stack.
   // In checked mode, if the type arguments are uninstantiated, they may need to
   // be checked against declared bounds at run time.
   Error& malformed_error = Error::Handle();
   if (FLAG_enable_type_checks &&
       requires_type_arguments &&
       !node->type_arguments().IsNull() &&
       !node->type_arguments().IsInstantiated() &&
@@ skipping 377 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64