Allocate generic types in new-space before canonicalizing.

runtime/lib/object.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/bootstrap_natives.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/code_patcher.h"
 #include "vm/exceptions.h"
 #include "vm/heap.h"
@@ skipping 105 matching lines @@
 
 DEFINE_NATIVE_ENTRY(Object_runtimeType, 1) {
   const Instance& instance = Instance::CheckedHandle(arguments->NativeArgAt(0));
   if (instance.IsString()) {
     return Type::StringType();
   } else if (instance.IsInteger()) {
     return Type::IntType();
   } else if (instance.IsDouble()) {
     return Type::Double();
   }
-  return instance.GetType();
+  return instance.GetType(Heap::kNew);
 }
 
 
 DEFINE_NATIVE_ENTRY(Object_haveSameRuntimeType, 2) {
   const Instance& left = Instance::CheckedHandle(arguments->NativeArgAt(0));
   const Instance& right = Instance::CheckedHandle(arguments->NativeArgAt(1));
 
   const intptr_t left_cid = left.GetClassId();
   const intptr_t right_cid = right.GetClassId();
 
   if (left_cid != right_cid) {
     if (RawObject::IsIntegerClassId(left_cid)) {
       return Bool::Get(RawObject::IsIntegerClassId(right_cid)).raw();
     } else if (RawObject::IsStringClassId(right_cid)) {
       return Bool::Get(RawObject::IsStringClassId(right_cid)).raw();
     } else {
       return Bool::False().raw();
     }
   }
 
   const Class& cls = Class::Handle(left.clazz());
   if (cls.IsClosureClass()) {
     // TODO(vegorov): provide faster implementation for closure classes.
-    const AbstractType& left_type = AbstractType::Handle(left.GetType());
-    const AbstractType& right_type = AbstractType::Handle(right.GetType());
+    const AbstractType& left_type =
+        AbstractType::Handle(left.GetType(Heap::kNew));
+    const AbstractType& right_type =
+        AbstractType::Handle(right.GetType(Heap::kNew));
     return Bool::Get(left_type.raw() == right_type.raw()).raw();
   }
 
   if (!cls.IsGeneric()) {
     return Bool::True().raw();
   }
 
   const TypeArguments& left_type_arguments =
       TypeArguments::Handle(left.GetTypeArguments());
   const TypeArguments& right_type_arguments =
@@ skipping 13 matching lines @@
   ASSERT(type.IsFinalized());
   ASSERT(!type.IsMalformed());
   ASSERT(!type.IsMalbounded());
   Error& bound_error = Error::Handle(zone, Error::null());
   const bool is_instance_of =
       instance.IsInstanceOf(type, instantiator_type_arguments, &bound_error);
   if (FLAG_trace_type_checks) {
     const char* result_str = is_instance_of ? "true" : "false";
     OS::Print("Native Object.instanceOf: result %s\n", result_str);
     const AbstractType& instance_type =
-        AbstractType::Handle(zone, instance.GetType());
+        AbstractType::Handle(zone, instance.GetType(Heap::kNew));
     OS::Print("  instance type: %s\n",
               String::Handle(zone, instance_type.Name()).ToCString());
     OS::Print("  test type: %s\n",
               String::Handle(zone, type.Name()).ToCString());
     if (!bound_error.IsNull()) {
       OS::Print("  bound error: %s\n", bound_error.ToErrorCString());
     }
   }
   if (!is_instance_of && !bound_error.IsNull()) {
     // Throw a dynamic type error only if the instanceof test fails.
@@ skipping 115 matching lines @@
   Error& bound_error = Error::Handle(zone);
   if (instance.IsNull()) {
     return instance.raw();
   }
   const bool is_instance_of =
       instance.IsInstanceOf(type, instantiator_type_arguments, &bound_error);
   if (FLAG_trace_type_checks) {
     const char* result_str = is_instance_of ? "true" : "false";
     OS::Print("Object.as: result %s\n", result_str);
     const AbstractType& instance_type =
-        AbstractType::Handle(zone, instance.GetType());
+        AbstractType::Handle(zone, instance.GetType(Heap::kNew));
     OS::Print("  instance type: %s\n",
               String::Handle(zone, instance_type.Name()).ToCString());
     OS::Print("  cast type: %s\n",
               String::Handle(zone, type.Name()).ToCString());
     if (!bound_error.IsNull()) {
       OS::Print("  bound error: %s\n", bound_error.ToErrorCString());
     }
   }
   if (!is_instance_of) {
     DartFrameIterator iterator;
     StackFrame* caller_frame = iterator.NextFrame();
     ASSERT(caller_frame != NULL);
     const TokenPosition location = caller_frame->GetTokenPos();
     const AbstractType& instance_type =
-        AbstractType::Handle(zone, instance.GetType());
+        AbstractType::Handle(zone, instance.GetType(Heap::kNew));
     if (!type.IsInstantiated()) {
       // Instantiate type before reporting the error.
       type = type.InstantiateFrom(instantiator_type_arguments, NULL, NULL, NULL,
                                   Heap::kNew);
       // Note that the instantiated type may be malformed.
     }
     if (bound_error.IsNull()) {
       Exceptions::CreateAndThrowTypeError(location, instance_type, type,
                                           Symbols::InTypeCast(),
                                           Object::null_string());
@@ skipping 55 matching lines @@
 
 DEFINE_NATIVE_ENTRY(Internal_inquireIs64Bit, 0) {
 #if defined(ARCH_IS_64_BIT)
   return Bool::True().raw();
 #else
   return Bool::False().raw();
 #endif  // defined(ARCH_IS_64_BIT)
 }
 
 }  // namespace dart