Chromium Code Reviews| Index: runtime/vm/flow_graph_builder.cc |
| =================================================================== |
| --- runtime/vm/flow_graph_builder.cc (revision 44463) |
| +++ runtime/vm/flow_graph_builder.cc (working copy) |
| @@ -4292,8 +4292,11 @@ |
| intptr_t outer_try_index = node->try_index(); |
| owner()->set_try_index(outer_try_index); |
| } |
| - BuildRestoreContext(node->context_var()); |
| + // Note: do not restore the saved_try_context here since the inlined |
| + // code is running at he context level of the return or jump instruction |
| + // that follows the inlined code. See issue 22822. |
|
regis
2015/03/16 22:26:14
at he -> at the
I find the comment implying a con
|
| + |
| JoinEntryInstr* finally_entry = |
| new(I) JoinEntryInstr(owner()->AllocateBlockId(), owner()->try_index()); |
| EffectGraphVisitor for_finally_block(owner()); |