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

runtime/vm/constant_propagator.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/constant_propagator.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
 #include "vm/flow_graph_range_analysis.h"
@@ skipping 745 matching lines @@
              ((rep == kUnboxedMint) && (value_cid == kMintCid)));
       // The representation guarantees the type check to be true.
       SetValue(instr, Bool::True());
     } else {
       SetValue(instr, non_constant_);
     }
   } else if (IsConstant(value)) {
     if (value.IsInstance()) {
       const Instance& instance = Instance::Cast(value);
       const AbstractType& checked_type = instr->type();
-      if (instr->instantiator_type_arguments()->BindsToConstantNull()) {
+      if (instr->instantiator_type_arguments()->BindsToConstantNull() &&
+          instr->function_type_arguments()->BindsToConstantNull() &&
+          checked_type.IsInstantiated(kParentFunctions)) {
         Error& bound_error = Error::Handle();
-        bool is_instance = instance.IsInstanceOf(
-            checked_type, Object::null_type_arguments(), &bound_error);
+        bool is_instance =
+            instance.IsInstanceOf(checked_type, Object::null_type_arguments(),
+                                  Object::null_type_arguments(), &bound_error);
         // Can only have bound error with generics.
         ASSERT(bound_error.IsNull());
         SetValue(instr, Bool::Get(is_instance));
         return;
       }
     }
     SetValue(instr, non_constant_);
   }
 }
 
@@ skipping 73 matching lines @@
       }
     }
   }
   SetValue(instr, non_constant_);
 }
 
 
 void ConstantPropagator::VisitInstantiateType(InstantiateTypeInstr* instr) {
   const Object& object =
       instr->instantiator_type_arguments()->definition()->constant_value();
-  // TODO(regis): Check function type arguments.
   if (IsNonConstant(object)) {
     SetValue(instr, non_constant_);
     return;
   }
   if (IsConstant(object)) {
-    if (instr->type().IsTypeParameter()) {
+    if (instr->type().IsTypeParameter() &&
+        TypeParameter::Cast(instr->type()).IsClassTypeParameter()) {
       if (object.IsNull()) {
         SetValue(instr, Object::dynamic_type());
         return;
       }
       // We could try to instantiate the type parameter and return it if no
       // malformed error is reported.
     }
     SetValue(instr, non_constant_);
   }
+  // TODO(regis): We can do the same as above for a function type parameter.
+  // Better: If both instantiator type arguments and function type arguments are
+  // constant, instantiate the type if no bound error is reported.
 }
 
 
 void ConstantPropagator::VisitInstantiateTypeArguments(
     InstantiateTypeArgumentsInstr* instr) {
-  const Object& object =
+  const Object& instantiator_type_args =
       instr->instantiator_type_arguments()->definition()->constant_value();
-  // TODO(regis): Check function type arguments.
-  if (IsNonConstant(object)) {
+  const Object& function_type_args =
+      instr->function_type_arguments()->definition()->constant_value();
+  if (IsNonConstant(instantiator_type_args) ||
+      IsNonConstant(function_type_args)) {
     SetValue(instr, non_constant_);
     return;
   }
-  if (IsConstant(object)) {
-    const intptr_t len = instr->type_arguments().Length();
-    if (instr->type_arguments().IsRawInstantiatedRaw(len) && object.IsNull()) {
-      SetValue(instr, object);
-      return;
+  if (IsConstant(instantiator_type_args) && IsConstant(function_type_args)) {
+    if (instantiator_type_args.IsNull() && function_type_args.IsNull()) {
+      const intptr_t len = instr->type_arguments().Length();
+      if (instr->type_arguments().IsRawInstantiatedRaw(len)) {
+        SetValue(instr, instantiator_type_args);
+        return;
+      }
     }
     if (instr->type_arguments().IsUninstantiatedIdentity() ||
         instr->type_arguments().CanShareInstantiatorTypeArguments(
             instr->instantiator_class())) {
-      SetValue(instr, object);
+      SetValue(instr, instantiator_type_args);
       return;
     }
     SetValue(instr, non_constant_);
   }
+  // TODO(regis): If both instantiator type arguments and function type
+  // arguments are constant, instantiate the type arguments if no bound error
+  // is reported.
+  // TODO(regis): If either instantiator type arguments or function type
+  // arguments are constant null, check if the type arguments is
+  // IsRawInstantiatedRaw separately for each genericity.

[zra, 2017/04/07 17:36:29]

'IsRawInstantiatedRaw' is this a typo?

[regis, 2017/04/11 04:23:07]

No :-)
It is used on line 902 if both instantiators are null, but we could use it for
each one separately. I wrote type_arguments().IsRawInstantiatedRaw() to be
clearer.

 }
 
 
 void ConstantPropagator::VisitAllocateContext(AllocateContextInstr* instr) {
   SetValue(instr, non_constant_);
 }
 
 
 void ConstantPropagator::VisitAllocateUninitializedContext(
     AllocateUninitializedContextInstr* instr) {
@@ skipping 800 matching lines @@
   GrowableArray<BitVector*> dominance_frontier;
   graph_->ComputeDominators(&dominance_frontier);
 
   if (FLAG_trace_constant_propagation &&
       FlowGraphPrinter::ShouldPrint(graph_->function())) {
     FlowGraphPrinter::PrintGraph("After CP", graph_);
   }
 }
 
 }  // namespace dart