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

runtime/vm/intermediate_language_x64.cc

Index: runtime/vm/intermediate_language_x64.cc
diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc
index 644e8b2e9d12f8b49d6835765cb11ef9061f1571..b93d89f8e12e767e80a04a4c7b85d1e715bf4d10 100644
--- a/runtime/vm/intermediate_language_x64.cc
+++ b/runtime/vm/intermediate_language_x64.cc
@@ -910,11 +910,12 @@ LocationSummary* StringInterpolateInstr::MakeLocationSummary(Zone* zone,
 void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register array = locs()->in(0).reg();
   __ pushq(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() == RAX);
 }
 
@@ -5330,10 +5331,11 @@ 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;
   __ pushq(value_obj);
   compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(), target,
-                               kNumberOfArguments,
+                               kTypeArgsLen, kNumberOfArguments,
                                Object::null_array(),  // No argument names.
                                locs(), ICData::Handle());
   __ Bind(&done);
@@ -6711,9 +6713,11 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
 
 void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   // Arguments descriptor is expected in R10.
-  intptr_t 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(R10, arguments_descriptor);
 
   // Function in RAX.