| Index: runtime/vm/flow_graph_compiler_x64.cc
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler_x64.cc (revision 45469)
|
| +++ runtime/vm/flow_graph_compiler_x64.cc (working copy)
|
| @@ -1361,7 +1361,14 @@
|
| AddCurrentDescriptor(RawPcDescriptors::kOther,
|
| Isolate::kNoDeoptId, token_pos);
|
| RecordSafepoint(locs);
|
| - AddDeoptIndexAtCall(Isolate::ToDeoptAfter(deopt_id), token_pos);
|
| + const intptr_t deopt_id_after = Isolate::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, RCX);
|
| }
|
|
|
|
|