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

Unified Diff: runtime/vm/il_printer.cc

Issue 22184003: Fix a bug in compilation of try-finally. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 4 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 | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/parser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/il_printer.cc
===================================================================
--- runtime/vm/il_printer.cc (revision 25764)
+++ runtime/vm/il_printer.cc (working copy)
@@ -821,7 +821,12 @@
void JoinEntryInstr::PrintTo(BufferFormatter* f) const {
- f->Print("B%"Pd"[join]:%"Pd" pred(", block_id(), GetDeoptId());
+ if (try_index() != CatchClauseNode::kInvalidTryIndex) {
+ f->Print("B%"Pd"[join try_idx %"Pd"]:%"Pd" pred(",
+ block_id(), try_index(), GetDeoptId());
+ } else {
+ f->Print("B%"Pd"[join]:%"Pd" pred(", block_id(), GetDeoptId());
+ }
for (intptr_t i = 0; i < predecessors_.length(); ++i) {
if (i > 0) f->Print(", ");
f->Print("B%"Pd, predecessors_[i]->block_id());
@@ -877,7 +882,12 @@
void TargetEntryInstr::PrintTo(BufferFormatter* f) const {
- f->Print("B%"Pd"[target]:%"Pd, block_id(), GetDeoptId());
+ if (try_index() != CatchClauseNode::kInvalidTryIndex) {
+ f->Print("B%"Pd"[target try_idx %"Pd"]:%"Pd,
+ block_id(), try_index(), GetDeoptId());
+ } else {
+ f->Print("B%"Pd"[target]:%"Pd, block_id(), GetDeoptId());
+ }
if (HasParallelMove()) {
f->Print(" ");
parallel_move()->PrintTo(f);
@@ -886,7 +896,8 @@
void CatchBlockEntryInstr::PrintTo(BufferFormatter* f) const {
- f->Print("B%"Pd"[target catch %"Pd"]", block_id(), catch_try_index());
+ f->Print("B%"Pd"[target catch try_idx %"Pd" catch_try_idx %"Pd"]",
+ block_id(), try_index(), catch_try_index());
if (HasParallelMove()) {
f->Print(" ");
parallel_move()->PrintTo(f);
« no previous file with comments | « runtime/vm/flow_graph_builder.cc ('k') | runtime/vm/parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698