| 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 d8478ad0e36d2ac7088d5114da5423062460b885..17f61aced5cf0166c9ce7c83a9143aa03121d514 100644
|
| --- a/runtime/vm/flow_graph_compiler_arm.cc
|
| +++ b/runtime/vm/flow_graph_compiler_arm.cc
|
| @@ -101,11 +101,9 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
|
| Zone* zone = compiler->zone();
|
|
|
| // Current PP, FP, and PC.
|
| - builder->AddPp(Function::Handle(zone, current->code().function()), slot_ix++);
|
| + builder->AddPp(current->function(), slot_ix++);
|
| builder->AddCallerFp(slot_ix++);
|
| - builder->AddReturnAddress(Function::Handle(zone, current->code().function()),
|
| - deopt_id(),
|
| - slot_ix++);
|
| + builder->AddReturnAddress(current->function(), deopt_id(), slot_ix++);
|
|
|
| // Callee's PC marker is not used anymore. Pass Function::null() to set to 0.
|
| builder->AddPcMarker(Function::Handle(zone), slot_ix++);
|
| @@ -126,20 +124,18 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
|
| current = current->outer();
|
| while (current != NULL) {
|
| // PP, FP, and PC.
|
| - builder->AddPp(
|
| - Function::Handle(zone, current->code().function()), slot_ix++);
|
| + builder->AddPp(current->function(), slot_ix++);
|
| builder->AddCallerFp(slot_ix++);
|
|
|
| // For any outer environment the deopt id is that of the call instruction
|
| // which is recorded in the outer environment.
|
| builder->AddReturnAddress(
|
| - Function::Handle(zone, current->code().function()),
|
| + current->function(),
|
| Isolate::ToDeoptAfter(current->deopt_id()),
|
| slot_ix++);
|
|
|
| // PC marker.
|
| - builder->AddPcMarker(Function::Handle(zone, previous->code().function()),
|
| - slot_ix++);
|
| + builder->AddPcMarker(previous->function(), slot_ix++);
|
|
|
| // The values of outgoing arguments can be changed from the inlined call so
|
| // we must read them from the previous environment.
|
| @@ -171,8 +167,7 @@ RawTypedData* CompilerDeoptInfo::CreateDeoptInfo(FlowGraphCompiler* compiler,
|
| builder->AddCallerPc(slot_ix++);
|
|
|
| // PC marker.
|
| - builder->AddPcMarker(Function::Handle(zone, previous->code().function()),
|
| - slot_ix++);
|
| + builder->AddPcMarker(previous->function(), slot_ix++);
|
|
|
| // For the outermost environment, set the incoming arguments.
|
| for (intptr_t i = previous->fixed_parameter_count() - 1; i >= 0; i--) {
|
|
|