Pass a second type argument vector to all type instantiation calls in the VM.

runtime/vm/intermediate_language.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 "vm/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/bootstrap.h"
 #include "vm/compiler.h"
 #include "vm/constant_propagator.h"
@@ skipping 2047 matching lines @@
   return this;
 }
 
 
 Definition* AssertAssignableInstr::Canonicalize(FlowGraph* flow_graph) {
   if (FLAG_eliminate_type_checks &&
       value()->Type()->IsAssignableTo(dst_type())) {
     return value()->definition();
   }
 
-  // For uninstantiated target types: If the instantiator type arguments
-  // are constant, instantiate the target type here.
-  if (dst_type().IsInstantiated()) return this;
+  // For uninstantiated target types: If the instantiator and function
+  // type arguments are constant, instantiate the target type here.
+  // If the uninstantiated type refers to parent function type parameters, we
+  // cannot instantiated it here.
+  if (dst_type().IsInstantiated() ||
+      !dst_type().IsInstantiated(kParentFunctions)) {
+    return this;
+  }
 
-  // TODO(regis): Only try to instantiate here if function_type_args is constant
-  // or null and dst_type does not refer to parent function type parameters.
-  ConstantInstr* constant_type_args =
+  ConstantInstr* constant_instantiator_type_args =
       instantiator_type_arguments()->definition()->AsConstant();
-  if (constant_type_args != NULL) {
-    ASSERT(constant_type_args->value().IsNull() ||
-           constant_type_args->value().IsTypeArguments());
+  ConstantInstr* constant_function_type_args =
+      function_type_arguments()->definition()->AsConstant();
+  if ((constant_instantiator_type_args != NULL) &&
+      (constant_function_type_args != NULL)) {
+    ASSERT(constant_instantiator_type_args->value().IsNull() ||
+           constant_instantiator_type_args->value().IsTypeArguments());
+    ASSERT(constant_function_type_args->value().IsNull() ||
+           constant_function_type_args->value().IsTypeArguments());
     TypeArguments& instantiator_type_args = TypeArguments::Handle();
-    instantiator_type_args ^= constant_type_args->value().raw();
+    instantiator_type_args ^= constant_instantiator_type_args->value().raw();
+    TypeArguments& function_type_args = TypeArguments::Handle();
+    function_type_args ^= constant_function_type_args->value().raw();
     Error& bound_error = Error::Handle();
-    AbstractType& new_dst_type =
-        AbstractType::Handle(dst_type().InstantiateFrom(
-            instantiator_type_args, /* function_type_args, */
-            &bound_error, NULL, NULL, Heap::kOld));
+    AbstractType& new_dst_type = AbstractType::Handle(
+        dst_type().InstantiateFrom(instantiator_type_args, function_type_args,
+                                   &bound_error, NULL, NULL, Heap::kOld));
     if (new_dst_type.IsMalformedOrMalbounded() || !bound_error.IsNull()) {
       return this;
     }
     if (new_dst_type.IsTypeRef()) {
       new_dst_type = TypeRef::Cast(new_dst_type).type();
     }
     new_dst_type = new_dst_type.Canonicalize();
     set_dst_type(new_dst_type);
 
     if (new_dst_type.IsDynamicType() || new_dst_type.IsObjectType() ||
         (FLAG_eliminate_type_checks &&
          value()->Type()->IsAssignableTo(new_dst_type))) {
       return value()->definition();
     }
 
     ConstantInstr* null_constant = flow_graph->constant_null();
     instantiator_type_arguments()->BindTo(null_constant);
-    // TODO(regis): function_type_arguments()->BindTo(null_constant);
+    function_type_arguments()->BindTo(null_constant);
   }
   return this;
 }
 
 
 Definition* InstantiateTypeArgumentsInstr::Canonicalize(FlowGraph* flow_graph) {
   return (Isolate::Current()->type_checks() || HasUses()) ? this : NULL;
 }
 
 
@@ skipping 1884 matching lines @@
                      "native function '%s' (%" Pd " arguments) cannot be found",
                      native_name().ToCString(), function().NumParameters());
   }
   set_is_auto_scope(auto_setup_scope);
   set_native_c_function(native_function);
 }
 
 #undef __
 
 }  // namespace dart