Index: runtime/vm/intermediate_language_arm.cc |
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc |
index 14e341e54d3285843578e5f7cb48561bc1606fc0..f73507ac3f0e2a8f6b2ba142bf0173134d0c60a2 100644 |
--- a/runtime/vm/intermediate_language_arm.cc |
+++ b/runtime/vm/intermediate_language_arm.cc |
@@ -225,9 +225,9 @@ 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 argument_count = ArgumentCount(); // Includes type args. |
+ const Array& arguments_descriptor = |
+ Array::ZoneHandle(Z, GetArgumentsDescriptor()); |
__ LoadObject(R4, arguments_descriptor); |
// R4: Arguments descriptor. |
@@ -1067,11 +1067,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(); |
+ ArgumentsInfo args_info(kTypeArgsLen, kNumberOfArguments, kNoArgumentNames); |
compiler->GenerateStaticCall(deopt_id(), token_pos(), CallFunction(), |
- kNumberOfArguments, kNoArgumentNames, locs(), |
- ICData::Handle()); |
+ args_info, locs(), ICData::Handle()); |
ASSERT(locs()->out(0).reg() == R0); |
} |
@@ -5866,12 +5867,12 @@ void DoubleToIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
const ICData& ic_data = *instance_call()->ic_data(); |
ASSERT(ic_data.NumberOfChecksIs(1)); |
const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(0)); |
- |
- const intptr_t kNumberOfArguments = 1; |
+ const int kTypeArgsLen = 0; |
+ const int kNumberOfArguments = 1; |
+ const Array& kNoArgumentNames = Object::null_array(); |
+ ArgumentsInfo args_info(kTypeArgsLen, kNumberOfArguments, kNoArgumentNames); |
compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(), target, |
- kNumberOfArguments, |
- Object::null_array(), // No argument names., |
- locs(), ICData::Handle()); |
+ args_info, locs(), ICData::Handle()); |
__ Bind(&done); |
} |