Index: runtime/vm/intermediate_language_ia32.cc |
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc |
index 6ace530e23167c3bffb78dada5c04eec8ed2c5b4..040e07800d224e0d7a4410b8bdb7be462b5fec31 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 kNumberOfArguments = 1; |
+ const intptr_t kTypeArgsLen = 0; |
+ const intptr_t 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() == EAX); |
} |
@@ -5382,9 +5383,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); |
@@ -6857,9 +6859,11 @@ 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())); |
+ 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(EDX, arguments_descriptor); |
// EBX: Code (compiled code or lazy compile stub). |