Implement eager instantiation and canonicalization of type arguments at run

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
@@ skipping 1320 matching lines @@
   }
   // Finalize all classes.
   Dart_Handle state = Api::CheckIsolateState(isolate);
   if (::Dart_IsError(state)) {
     *value = false;
     return state;
   }
   CHECK_CALLBACK_STATE(isolate);
   Error& malformed_type_error = Error::Handle(isolate);
   *value = instance.IsInstanceOf(type_obj,
-                                 Object::null_abstract_type_arguments(),
+                                 Object::null_type_arguments(),
                                  &malformed_type_error);
   ASSERT(malformed_type_error.IsNull());  // Type was created from a class.
   return Api::Success();
 }
 
 
 DART_EXPORT bool Dart_IsInstance(Dart_Handle object) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Object& obj = Object::Handle(isolate, Api::UnwrapHandle(object));
@@ skipping 1586 matching lines @@
   }
 
   // Get the class to instantiate.
   Object& unchecked_type = Object::Handle(Api::UnwrapHandle(type));
   if (unchecked_type.IsNull() || !unchecked_type.IsType()) {
     RETURN_TYPE_ERROR(isolate, type, Type);
   }
   Type& type_obj = Type::Handle();
   type_obj ^= unchecked_type.raw();
   Class& cls = Class::Handle(isolate, type_obj.type_class());
-  AbstractTypeArguments& type_arguments =
-      AbstractTypeArguments::Handle(isolate, type_obj.arguments());
+  TypeArguments& type_arguments =
+      TypeArguments::Handle(isolate, type_obj.arguments());
 
   const String& base_constructor_name = String::Handle(isolate, cls.Name());
 
   // And get the name of the constructor to invoke.
   String& dot_name = String::Handle(isolate);
   result = Api::UnwrapHandle(constructor_name);
   if (result.IsNull()) {
     dot_name = Symbols::Dot().raw();
   } else if (result.IsString()) {
     dot_name = String::Concat(Symbols::Dot(), String::Cast(result));
@@ skipping 32 matching lines @@
 
     if (!redirect_type.IsInstantiated()) {
       // The type arguments of the redirection type are instantiated from the
       // type arguments of the type argument.
       Error& bound_error = Error::Handle();
       redirect_type ^= redirect_type.InstantiateFrom(type_arguments,
                                                      &bound_error);
       if (!bound_error.IsNull()) {
         return Api::NewHandle(isolate, bound_error.raw());
       }
+      redirect_type ^= redirect_type.Canonicalize();
     }
 
     type_obj = redirect_type.raw();
     type_arguments = redirect_type.arguments();
 
     cls = type_obj.type_class();
   }
   if (constructor.IsConstructor()) {
     // Create the new object.
     new_object = Instance::New(cls);
@@ skipping 141 matching lines @@
 
   // Construct name of the constructor to invoke.
   const Type& type_obj = Type::Handle(isolate, instance.GetType());
   const Class& cls = Class::Handle(isolate, type_obj.type_class());
   const String& class_name = String::Handle(isolate, cls.Name());
   const Array& strings = Array::Handle(Array::New(3));
   strings.SetAt(0, class_name);
   strings.SetAt(1, Symbols::Dot());
   strings.SetAt(2, constructor_name);
   const String& dot_name = String::Handle(isolate, String::ConcatAll(strings));
-  const AbstractTypeArguments& type_arguments =
-    AbstractTypeArguments::Handle(isolate, type_obj.arguments());
+  const TypeArguments& type_arguments =
+    TypeArguments::Handle(isolate, type_obj.arguments());

[srdjan, 2014/02/07 21:59:47]

Indent 4 spaces

   const Function& constructor =
     Function::Handle(isolate, cls.LookupFunctionAllowPrivate(dot_name));
   const int extra_args = 2;
   if (!constructor.IsNull() &&
       constructor.IsConstructor() &&
       constructor.AreValidArgumentCounts(number_of_arguments + extra_args,
                                          0,
                                          NULL)) {
     // Create the argument list.
     // Constructors get the uninitialized object and a constructor phase.
@@ skipping 1373 matching lines @@
 }
 
 
 // --- Service support ---
 
 DART_EXPORT Dart_Isolate Dart_GetServiceIsolate(void* callback_data) {
   return Api::CastIsolate(Service::GetServiceIsolate(callback_data));
 }
 
 }  // namespace dart