Check for a passed-in type argument vector in the prolog of generic functions.

runtime/vm/il_printer.cc

 // Copyright (c) 2012, 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/il_printer.h"
 
 #include "vm/flow_graph_range_analysis.h"
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
@@ skipping 482 matching lines @@
   f->Print("%" Pd "", num_temps());
   if (value() != NULL) {
     f->Print(", ");
     value()->PrintTo(f);
   }
 }
 
 
 void AssertAssignableInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
-  f->Print(", %s, '%s'", dst_type().ToCString(), dst_name().ToCString());
-  f->Print(" instantiator_type_arguments(");
+  f->Print(", %s, '%s',", dst_type().ToCString(), dst_name().ToCString());
+  f->Print(" instantiator_type_args(");
   instantiator_type_arguments()->PrintTo(f);
+  f->Print("), function_type_args(");
+  function_type_arguments()->PrintTo(f);
   f->Print(")");
 }
 
 
 void AssertBooleanInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
 }
 
 
 void ClosureCallInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print(" function=");
   InputAt(0)->PrintTo(f);
+  f->Print("<%" Pd ">", type_args_len());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     f->Print(", ");
     PushArgumentAt(i)->value()->PrintTo(f);
   }
 }
 
 
 void InstanceCallInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print(" %s", function_name().ToCString());
+  f->Print(" %s<%" Pd ">", function_name().ToCString(), type_args_len());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     f->Print(", ");
     PushArgumentAt(i)->value()->PrintTo(f);
   }
   if (HasICData()) {
     if (FLAG_display_sorted_ic_data) {
       PrintICDataSortedHelper(f, *ic_data());
     } else {
       PrintICDataHelper(f, *ic_data(), FlowGraphPrinter::kPrintAll);
     }
   }
 }
 
 
 void PolymorphicInstanceCallInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print(" %s", instance_call()->function_name().ToCString());
+  f->Print(" %s<%" Pd ">", instance_call()->function_name().ToCString(),
+           instance_call()->type_args_len());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     f->Print(", ");
     PushArgumentAt(i)->value()->PrintTo(f);
   }
   PrintTargetsHelper(f, targets_, FlowGraphPrinter::kPrintAll);
   if (complete()) {
     f->Print(" COMPLETE");
   }
 }
 
@@ skipping 29 matching lines @@
 
 
 void EqualityCompareInstr::PrintOperandsTo(BufferFormatter* f) const {
   left()->PrintTo(f);
   f->Print(" %s ", Token::Str(kind()));
   right()->PrintTo(f);
 }
 
 
 void StaticCallInstr::PrintOperandsTo(BufferFormatter* f) const {
-  f->Print(" %s ", String::Handle(function().name()).ToCString());
+  f->Print(" %s<%" Pd "> ", String::Handle(function().name()).ToCString(),
+           type_args_len());
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     if (i > 0) f->Print(", ");
     PushArgumentAt(i)->value()->PrintTo(f);
   }
 }
 
 
 void LoadLocalInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s @%d", local().name().ToCString(), local().index());
 }
@@ skipping 42 matching lines @@
 
 
 void StoreStaticFieldInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", String::Handle(field().name()).ToCString());
   value()->PrintTo(f);
 }
 
 
 void InstanceOfInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
-  f->Print(" IS %s", String::Handle(type().Name()).ToCString());
-  f->Print(" type-arg(");
+  f->Print(" IS %s,", String::Handle(type().Name()).ToCString());
+  f->Print(" instantiator_type_args(");
   instantiator_type_arguments()->PrintTo(f);
+  f->Print("), function_type_args(");
+  function_type_arguments()->PrintTo(f);
   f->Print(")");
 }
 
 
 void RelationalOpInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(kind()));
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
 }
@@ skipping 38 matching lines @@
     f->Print(" [%s %s]", field()->is_nullable() ? "nullable" : "non-nullable",
              expected);
   }
 
   f->Print(", immutable=%d", immutable_);
 }
 
 
 void InstantiateTypeInstr::PrintOperandsTo(BufferFormatter* f) const {
   const String& type_name = String::Handle(type().Name());
-  f->Print("%s, ", type_name.ToCString());
+  f->Print("%s,", type_name.ToCString());
+  f->Print(" instantiator_type_args(");
   instantiator_type_arguments()->PrintTo(f);
+  f->Print("), function_type_args(");
+  function_type_arguments()->PrintTo(f);
+  f->Print(")");
 }
 
 
 void InstantiateTypeArgumentsInstr::PrintOperandsTo(BufferFormatter* f) const {
   const String& type_args = String::Handle(type_arguments().Name());
-  f->Print("%s, ", type_args.ToCString());
+  f->Print("%s,", type_args.ToCString());
+  f->Print(" instantiator_type_args(");
   instantiator_type_arguments()->PrintTo(f);
+  f->Print("), function_type_args(");
+  function_type_arguments()->PrintTo(f);
+  f->Print(")");
 }
 
 
 void AllocateContextInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%" Pd "", num_context_variables());
 }
 
 
 void AllocateUninitializedContextInstr::PrintOperandsTo(
     BufferFormatter* f) const {
@@ skipping 663 matching lines @@
 }
 
 
 bool FlowGraphPrinter::ShouldPrint(const Function& function) {
   return false;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart