Chromium Code Reviews| Index: runtime/vm/flow_graph.cc |
| diff --git a/runtime/vm/flow_graph.cc b/runtime/vm/flow_graph.cc |
| index f513b304c012f92220fa118ad8641bb91b59e133..46ecb5d92b4ea886d1d24522fefebbf07c71fa6b 100644 |
| --- a/runtime/vm/flow_graph.cc |
| +++ b/runtime/vm/flow_graph.cc |
| @@ -2014,7 +2014,7 @@ void FlowGraph::EliminateEnvironments() { |
| } |
| for (ForwardInstructionIterator it(block); !it.Done(); it.Advance()) { |
| Instruction* current = it.Current(); |
| - if (!current->CanDeoptimize()) { |
| + if (!current->CanDeoptimize() && !current->MayThrow()) { |
|
Vyacheslav Egorov (Google)
2016/11/01 13:19:06
BranchInstr::CanDeoptimize(...) has some special c
Florian Schneider
2016/11/01 15:26:25
I'll add a check if the instruction is inside a tr
|
| // TODO(srdjan): --source-lines needs deopt environments to get at |
| // the code for this instruction, however, leaving the environment |
| // changes code. |