Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1148)

Unified Diff: runtime/vm/flow_graph_builder.cc

Issue 1006463003: Fix restoring of contexts in inlined finally code (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/language/language.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « no previous file | tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698