Fix type tests involving an implicit closure of a non-parameterized class

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"
 #include "vm/ast_printer.h"
+#include "vm/class_finalizer.h"
 #include "vm/dart_entry.h"
 #include "vm/ic_data.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/resolver.h"
 #include "vm/stub_code.h"
 
 namespace dart {
@@ skipping 839 matching lines @@
       node->receiver()->Visit(this);
     }
   }
   // The function type of a closure may have type arguments. In that case, pass
   // the type arguments of the instantiator.
   const Class& cls = Class::Handle(function.signature_class());
   ASSERT(!cls.IsNull());
   const bool requires_type_arguments = cls.HasTypeArguments();
   if (requires_type_arguments) {
     ASSERT(!function.IsImplicitStaticClosureFunction());
-    GenerateInstantiatorTypeArguments();
+    GenerateInstantiatorTypeArguments(node->token_index());
   }
   const Code& stub = Code::Handle(
       StubCode::GetAllocationStubForClosure(function));
   const ExternalLabel label(function.ToCString(), stub.EntryPoint());
   GenerateCall(node->token_index(), &label);
   if (requires_type_arguments) {
     __ popl(ECX);  // Pop type arguments.
   }
   if (function.IsImplicitInstanceClosureFunction()) {
     __ popl(ECX);  // Pop receiver.
@@ skipping 538 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()) {
-    GenerateInstantiatorTypeArguments();
+    GenerateInstantiatorTypeArguments(token_index);
   } else {
     __ pushl(raw_null);  // 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()) {
-    GenerateInstantiatorTypeArguments();
+    GenerateInstantiatorTypeArguments(token_index);
   } else {
     __ pushl(raw_null);  // 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 @@
   // 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);
+void CodeGenerator::GenerateInstantiatorTypeArguments(intptr_t token_index) {
+  const Class& instantiator_class =
+      Class::Handle(parsed_function().function().owner());
+  if (instantiator_class.NumTypeParameters() == 0) {
+    // The type arguments are compile time constants.
+    TypeArguments& type_arguments = TypeArguments::ZoneHandle();
+    const Type& type = Type::Handle(
+        Type::NewParameterizedType(instantiator_class, type_arguments));
+    const String& errmsg = String::Handle(
+        ClassFinalizer::FinalizeTypeWhileParsing(type));
+    if (!errmsg.IsNull()) {
+      ErrorMsg(token_index, errmsg.ToCString());
+    }
+    type_arguments = type.arguments();
+    __ PushObject(type_arguments);
+  } else {
+    ASSERT(parsed_function().instantiator() != NULL);
+    parsed_function().instantiator()->Visit(this);
+    if (!parsed_function().function().IsInFactoryScope()) {
+      __ popl(EAX);  // Pop instantiator.
+      // 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
@@ skipping 14 matching lines @@
       // 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.
         __ pushl(raw_null);  // Null instantiator.
       }
     }
   } else {
     // The type arguments are uninstantiated.
     ASSERT(node->constructor().IsFactory() || requires_type_arguments);
-    GenerateInstantiatorTypeArguments();
+    GenerateInstantiatorTypeArguments(node->token_index());
     __ popl(EAX);  // Pop instantiator.
     // 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;
     __ cmpl(EAX, raw_null);
     __ j(EQUAL, &type_arguments_instantiated, Assembler::kNearJump);
 
     // Instantiate non-null type arguments.
     if (node->type_arguments().IsUninstantiatedIdentity()) {
@@ skipping 396 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