Pass type argument vector to generic functions (if --reify-generic-functions is

runtime/vm/intermediate_language.cc

Index: runtime/vm/intermediate_language.cc
diff --git a/runtime/vm/intermediate_language.cc b/runtime/vm/intermediate_language.cc
index 79e5100a6b77a1d780817340c9e4f3bd93e64e7a..c9985b92a31d0153ab484a2945eb04e58872319f 100644
--- a/runtime/vm/intermediate_language.cc
+++ b/runtime/vm/intermediate_language.cc
@@ -3176,8 +3176,11 @@ void InstanceCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   const ICData* call_ic_data = NULL;
   if (!FLAG_propagate_ic_data || !compiler->is_optimizing() ||
       (ic_data() == NULL)) {
-    const Array& arguments_descriptor = Array::Handle(
-        zone, ArgumentsDescriptor::New(ArgumentCount(), argument_names()));
+    const Array& arguments_descriptor =
+        Array::Handle(zone, ArgumentsDescriptor::New(
+                                type_args_len(),
+                                ArgumentCount() - (type_args_len() > 0 ? 1 : 0),
+                                argument_names()));
     call_ic_data = compiler->GetOrAddInstanceCallICData(
         deopt_id(), function_name(), arguments_descriptor,
         checked_argument_count());
@@ -3348,17 +3351,18 @@ void PolymorphicInstanceCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (!with_checks()) {
     ASSERT(targets().HasSingleTarget());
     const Function& target = targets().FirstTarget();
-    compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(),
-                                 target, instance_call()->ArgumentCount(),
-                                 instance_call()->argument_names(), locs(),
-                                 ICData::Handle());
+    compiler->GenerateStaticCall(
+        deopt_id(), instance_call()->token_pos(), target,
+        instance_call()->type_args_len(), instance_call()->ArgumentCount(),
+        instance_call()->argument_names(), locs(), ICData::Handle());
     return;
   }
 
   compiler->EmitPolymorphicInstanceCall(
-      targets_, *instance_call(), instance_call()->ArgumentCount(),
-      instance_call()->argument_names(), deopt_id(),
-      instance_call()->token_pos(), locs(), complete(), total_call_count());
+      targets_, *instance_call(), instance_call()->type_args_len(),
+      instance_call()->ArgumentCount(), instance_call()->argument_names(),
+      deopt_id(), instance_call()->token_pos(), locs(), complete(),
+      total_call_count());
 }
 #endif
 
@@ -3475,8 +3479,9 @@ void StaticCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   const ICData* call_ic_data = NULL;
   if (!FLAG_propagate_ic_data || !compiler->is_optimizing() ||
       (ic_data() == NULL)) {
-    const Array& arguments_descriptor = Array::Handle(
-        ArgumentsDescriptor::New(ArgumentCount(), argument_names()));
+    const Array& arguments_descriptor = Array::Handle(ArgumentsDescriptor::New(
+        type_args_len(), ArgumentCount() - (type_args_len() > 0 ? 1 : 0),
+        argument_names()));
     MethodRecognizer::Kind recognized_kind =
         MethodRecognizer::RecognizeKind(function());
     int num_args_checked = 0;
@@ -3497,12 +3502,14 @@ void StaticCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
 
 #if !defined(TARGET_ARCH_DBC)
   compiler->GenerateStaticCall(deopt_id(), token_pos(), function(),
-                               ArgumentCount(), argument_names(), locs(),
-                               *call_ic_data);
+                               type_args_len(), ArgumentCount(),
+                               argument_names(), locs(), *call_ic_data);
 #else
   const Array& arguments_descriptor =
       (ic_data() == NULL) ? Array::Handle(ArgumentsDescriptor::New(
-                                ArgumentCount(), argument_names()))
+                                type_args_len(),
+                                ArgumentCount() - (type_args_len() > 0 ? 1 : 0),
+                                argument_names()))
                           : Array::Handle(ic_data()->arguments_descriptor());
   const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor);
 
@@ -3783,13 +3790,14 @@ intptr_t CheckArrayBoundInstr::LengthOffsetFor(intptr_t class_id) {
 
 const Function& StringInterpolateInstr::CallFunction() const {
   if (function_.IsNull()) {
+    const int kTypeArgsLen = 0;
     const int kNumberOfArguments = 1;
     const Array& kNoArgumentNames = Object::null_array();
     const Class& cls =
         Class::Handle(Library::LookupCoreClass(Symbols::StringBase()));
     ASSERT(!cls.IsNull());
     function_ = Resolver::ResolveStatic(
-        cls, Library::PrivateCoreLibName(Symbols::Interpolate()),
+        cls, Library::PrivateCoreLibName(Symbols::Interpolate()), kTypeArgsLen,
         kNumberOfArguments, kNoArgumentNames);
   }
   ASSERT(!function_.IsNull());