| Index: runtime/vm/flow_graph_compiler_ia32.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler_ia32.cc (revision 44707)
|
| +++ runtime/vm/flow_graph_compiler_ia32.cc (working copy)
|
| @@ -95,11 +95,13 @@
|
| builder->MarkFrameStart();
|
|
|
| // Callee's PC marker is not used anymore. Pass Code::null() to set to 0.
|
| - builder->AddPcMarker(Code::Handle(), slot_ix++);
|
| + builder->AddPcMarker(Function::Handle(), slot_ix++);
|
|
|
| // Current FP and PC.
|
| builder->AddCallerFp(slot_ix++);
|
| - builder->AddReturnAddress(current->code(), deopt_id(), slot_ix++);
|
| + builder->AddReturnAddress(Function::Handle(current->code().function()),
|
| + deopt_id(),
|
| + slot_ix++);
|
|
|
| // Emit all values that are needed for materialization as a part of the
|
| // expression stack for the bottom-most frame. This guarantees that GC
|
| @@ -114,7 +116,7 @@
|
| }
|
|
|
| // Current PC marker and caller FP.
|
| - builder->AddPcMarker(current->code(), slot_ix++);
|
| + builder->AddPcMarker(Function::Handle(current->code().function()), slot_ix++);
|
| builder->AddCallerFp(slot_ix++);
|
|
|
| Environment* previous = current;
|
| @@ -122,7 +124,7 @@
|
| while (current != NULL) {
|
| // For any outer environment the deopt id is that of the call instruction
|
| // which is recorded in the outer environment.
|
| - builder->AddReturnAddress(current->code(),
|
| + builder->AddReturnAddress(Function::Handle(current->code().function()),
|
| Isolate::ToDeoptAfter(current->deopt_id()),
|
| slot_ix++);
|
|
|
| @@ -144,7 +146,8 @@
|
| }
|
|
|
| // PC marker and caller FP.
|
| - builder->AddPcMarker(current->code(), slot_ix++);
|
| + builder->AddPcMarker(Function::Handle(current->code().function()),
|
| + slot_ix++);
|
| builder->AddCallerFp(slot_ix++);
|
|
|
| // Iterate on the outer environment.
|
|
|