| Index: runtime/vm/intermediate_language_dbc.cc
|
| diff --git a/runtime/vm/intermediate_language_dbc.cc b/runtime/vm/intermediate_language_dbc.cc
|
| index 3838de2cbf23169b146711bf97fbfdd8a6d999b3..d788da091dd1c7471963cfec4f9ce3d72716e197 100644
|
| --- a/runtime/vm/intermediate_language_dbc.cc
|
| +++ b/runtime/vm/intermediate_language_dbc.cc
|
| @@ -239,8 +239,8 @@ EMIT_NATIVE_CODE(PolymorphicInstanceCall,
|
| 0,
|
| Location::RegisterLocation(0),
|
| LocationSummary::kCall) {
|
| - const Array& arguments_descriptor = Array::Handle(ArgumentsDescriptor::New(
|
| - instance_call()->ArgumentCount(), instance_call()->argument_names()));
|
| + const Array& arguments_descriptor =
|
| + instance_call()->GetArgumentsDescriptor(Thread::Current()->zone());
|
| const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor);
|
| const CallTargets& ic_data = targets();
|
|
|
| @@ -451,12 +451,11 @@ EMIT_NATIVE_CODE(ClosureCall,
|
| __ Push(locs()->in(0).reg());
|
| }
|
|
|
| - intptr_t argument_count = ArgumentCount();
|
| - const Array& arguments_descriptor = Array::ZoneHandle(
|
| - ArgumentsDescriptor::New(argument_count, argument_names()));
|
| + const Array& arguments_descriptor =
|
| + GetArgumentsDescriptor(Thread::Current()->zone());
|
| const intptr_t argdesc_kidx =
|
| compiler->assembler()->AddConstant(arguments_descriptor);
|
| - __ StaticCall(argument_count, argdesc_kidx);
|
| + __ StaticCall(ArgumentCount(), argdesc_kidx);
|
| compiler->RecordAfterCall(this, FlowGraphCompiler::kHasResult);
|
| if (compiler->is_optimizing()) {
|
| __ PopLocal(locs()->out(0).reg());
|
| @@ -919,9 +918,10 @@ EMIT_NATIVE_CODE(StringInterpolate,
|
| if (compiler->is_optimizing()) {
|
| __ Push(locs()->in(0).reg());
|
| }
|
| + const intptr_t kTypeArgsLen = 0;
|
| const intptr_t kArgumentCount = 1;
|
| - const Array& arguments_descriptor = Array::Handle(
|
| - ArgumentsDescriptor::New(kArgumentCount, Object::null_array()));
|
| + const Array& arguments_descriptor = Array::Handle(ArgumentsDescriptor::New(
|
| + kTypeArgsLen, kArgumentCount, Object::null_array()));
|
| __ PushConstant(CallFunction());
|
| const intptr_t argdesc_kidx = __ AddConstant(arguments_descriptor);
|
| __ StaticCall(kArgumentCount, argdesc_kidx);
|
|
|