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

runtime/vm/intermediate_language_arm.cc

Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index 0fd2ada46bb0c2aecfe4699202b52ec88565efe6..c1f477197300ea073bb8789023d83c7611b50280 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -225,9 +225,11 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
 
 void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   // Load arguments descriptor in R4.
-  int argument_count = ArgumentCount();
-  const Array& arguments_descriptor = Array::ZoneHandle(
-      ArgumentsDescriptor::New(argument_count, argument_names()));
+  const intptr_t ta_len = type_args_len();
+  const intptr_t argument_count = ArgumentCount();  // Includes type args.
+  const Array& arguments_descriptor =
+      Array::ZoneHandle(ArgumentsDescriptor::New(
+          ta_len, argument_count - (ta_len > 0 ? 1 : 0), argument_names()));
   __ LoadObject(R4, arguments_descriptor);
 
   // R4: Arguments descriptor.
@@ -1067,11 +1069,12 @@ LocationSummary* StringInterpolateInstr::MakeLocationSummary(Zone* zone,
 void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   const Register array = locs()->in(0).reg();
   __ Push(array);
+  const int kTypeArgsLen = 0;
   const int kNumberOfArguments = 1;
   const Array& kNoArgumentNames = Object::null_array();
   compiler->GenerateStaticCall(deopt_id(), token_pos(), CallFunction(),
-                               kNumberOfArguments, kNoArgumentNames, locs(),
-                               ICData::Handle());
+                               kTypeArgsLen, kNumberOfArguments,
+                               kNoArgumentNames, locs(), ICData::Handle());
   ASSERT(locs()->out(0).reg() == R0);
 }
 
@@ -5867,9 +5870,10 @@ void DoubleToIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(ic_data.NumberOfChecksIs(1));
   const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(0));
 
+  const intptr_t kTypeArgsLen = 0;
   const intptr_t kNumberOfArguments = 1;
   compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(), target,
-                               kNumberOfArguments,
+                               kTypeArgsLen, kNumberOfArguments,
                                Object::null_array(),  // No argument names.,
                                locs(), ICData::Handle());
   __ Bind(&done);