Fix a bug in compilation of try-finally.

runtime/vm/il_printer.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/il_printer.h"
 
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 
@@ skipping 803 matching lines @@
       Definition* def = defns[i];
       f->Print("\n      ");
       def->PrintTo(f);
     }
     f->Print("\n}");
   }
 }
 
 
 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());
   }
   f->Print(")");
   if (phis_ != NULL) {
     f->Print(" {");
     for (intptr_t i = 0; i < phis_->length(); ++i) {
       if ((*phis_)[i] == NULL) continue;
       f->Print("\n      ");
@@ skipping 35 matching lines @@
   f->Print("%"Pd, index());
 }
 
 
 void CheckStackOverflowInstr::PrintOperandsTo(BufferFormatter* f) const {
   if (in_loop()) f->Print("depth %"Pd, loop_depth());
 }
 
 
 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);
   }
 }
 
 
 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);
   }
 
   const GrowableArray<Definition*>& defns = initial_definitions_;
   if (defns.length() > 0) {
     f->Print(" {");
     for (intptr_t i = 0; i < defns.length(); ++i) {
       Definition* def = defns[i];
@@ skipping 59 matching lines @@
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
   if (outer_ != NULL) outer_->PrintTo(f);
 }
 
 }  // namespace dart