| Index: runtime/vm/intermediate_language_ia32.cc
|
| diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc
|
| index 967fb56d95a4b85d5e2db722ff141b9e0e2d0c5d..54bcb4ae148ab6b673b058d972eb5aa402ea24b3 100644
|
| --- a/runtime/vm/intermediate_language_ia32.cc
|
| +++ b/runtime/vm/intermediate_language_ia32.cc
|
| @@ -940,11 +940,12 @@ LocationSummary* StringInterpolateInstr::MakeLocationSummary(Zone* zone,
|
| void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| Register array = locs()->in(0).reg();
|
| __ pushl(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() == EAX);
|
| }
|
|
|
| @@ -5381,12 +5382,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);
|
| }
|
|
|
| @@ -6835,10 +6836,10 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
|
|
|
|
|
| void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| - // Load arguments descriptors.
|
| - intptr_t argument_count = ArgumentCount();
|
| - const Array& arguments_descriptor = Array::ZoneHandle(
|
| - ArgumentsDescriptor::New(argument_count, argument_names()));
|
| + // Load arguments descriptor.
|
| + const intptr_t argument_count = ArgumentCount(); // Includes type args.
|
| + const Array& arguments_descriptor =
|
| + Array::ZoneHandle(Z, GetArgumentsDescriptor());
|
| __ LoadObject(EDX, arguments_descriptor);
|
|
|
| // EBX: Code (compiled code or lazy compile stub).
|
|
|