| Index: runtime/vm/flow_graph_compiler_arm.cc
|
| diff --git a/runtime/vm/flow_graph_compiler_arm.cc b/runtime/vm/flow_graph_compiler_arm.cc
|
| index fb944158a288ae7bf25e39355ce918120207a599..a11916db9e64fb4dc09567874900d56c39d8a174 100644
|
| --- a/runtime/vm/flow_graph_compiler_arm.cc
|
| +++ b/runtime/vm/flow_graph_compiler_arm.cc
|
| @@ -1265,20 +1265,57 @@ void FlowGraphCompiler::EmitMegamorphicInstanceCall(
|
| ASSERT(!arguments_descriptor.IsNull() && (arguments_descriptor.Length() > 0));
|
| const MegamorphicCache& cache = MegamorphicCache::ZoneHandle(zone(),
|
| MegamorphicCacheTable::Lookup(isolate(), name, arguments_descriptor));
|
| - const Register receiverR = R0;
|
| - const Register cacheR = R1;
|
| - const Register targetR = R1;
|
| - __ LoadFromOffset(kWord, receiverR, SP, (argument_count - 1) * kWordSize);
|
| - __ LoadObject(cacheR, cache);
|
|
|
| + __ Comment("MegamorphicCall");
|
| + __ LoadFromOffset(kWord, R0, SP, (argument_count - 1) * kWordSize);
|
| + __ LoadObject(R9, cache);
|
| if (FLAG_use_megamorphic_stub) {
|
| __ BranchLink(*StubCode::MegamorphicLookup_entry());
|
| - } else {
|
| - StubCode::EmitMegamorphicLookup(assembler(), receiverR, cacheR, targetR);
|
| + } else {
|
| + StubCode::EmitMegamorphicLookup(assembler());
|
| }
|
| - __ LoadObject(R9, ic_data);
|
| - __ LoadObject(R4, arguments_descriptor);
|
| - __ blx(targetR);
|
| + __ blx(R1);
|
| +
|
| + AddCurrentDescriptor(RawPcDescriptors::kOther, Thread::kNoDeoptId, token_pos);
|
| + RecordSafepoint(locs);
|
| + const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id);
|
| + if (is_optimizing()) {
|
| + AddDeoptIndexAtCall(deopt_id_after, token_pos);
|
| + } else {
|
| + // Add deoptimization continuation point after the call and before the
|
| + // arguments are removed.
|
| + AddCurrentDescriptor(RawPcDescriptors::kDeopt,
|
| + deopt_id_after, token_pos);
|
| + }
|
| + __ Drop(argument_count);
|
| +}
|
| +
|
| +
|
| +void FlowGraphCompiler::EmitSwitchableInstanceCall(
|
| + const ICData& ic_data,
|
| + intptr_t argument_count,
|
| + intptr_t deopt_id,
|
| + intptr_t token_pos,
|
| + LocationSummary* locs) {
|
| + __ Comment("SwitchableCall");
|
| + __ LoadFromOffset(kWord, R0, SP, (argument_count - 1) * kWordSize);
|
| + if (ic_data.NumArgsTested() == 1) {
|
| + __ LoadUniqueObject(R9, ic_data);
|
| + __ BranchLinkPatchable(*StubCode::ICLookup_entry());
|
| + } else {
|
| + const String& name = String::Handle(zone(), ic_data.target_name());
|
| + const Array& arguments_descriptor =
|
| + Array::ZoneHandle(zone(), ic_data.arguments_descriptor());
|
| + ASSERT(!arguments_descriptor.IsNull() &&
|
| + (arguments_descriptor.Length() > 0));
|
| + const MegamorphicCache& cache = MegamorphicCache::ZoneHandle(zone(),
|
| + MegamorphicCacheTable::Lookup(isolate(), name, arguments_descriptor));
|
| +
|
| + __ LoadUniqueObject(R9, cache);
|
| + __ BranchLinkPatchable(*StubCode::MegamorphicLookup_entry());
|
| + }
|
| + __ blx(R1);
|
| +
|
| AddCurrentDescriptor(RawPcDescriptors::kOther, Thread::kNoDeoptId, token_pos);
|
| RecordSafepoint(locs);
|
| const intptr_t deopt_id_after = Thread::ToDeoptAfter(deopt_id);
|
|
|