Stop attaching try_index to individual instructions put it at block entry instead.

runtime/vm/flow_graph_compiler_ia32.h

Index: runtime/vm/flow_graph_compiler_ia32.h
diff --git a/runtime/vm/flow_graph_compiler_ia32.h b/runtime/vm/flow_graph_compiler_ia32.h
index bac60e6839040c940bf790f2ffb7f4ad65966282..683ee4e1852854d0c3c239061e7e491a766db5d8 100644
--- a/runtime/vm/flow_graph_compiler_ia32.h
+++ b/runtime/vm/flow_graph_compiler_ia32.h
@@ -79,33 +79,28 @@ class FlowGraphCompiler : public ValueObject {
 
   void GenerateCallRuntime(intptr_t deopt_id,
                            intptr_t token_pos,
-                           intptr_t try_index,
                            const RuntimeEntry& entry,
                            LocationSummary* locs);
 
   void GenerateCall(intptr_t token_pos,
-                    intptr_t try_index,
                     const ExternalLabel* label,
                     PcDescriptors::Kind kind,
                     LocationSummary* locs);
 
   void GenerateAssertAssignable(intptr_t deopt_id,
                                 intptr_t token_pos,
-                                intptr_t try_index,
                                 const AbstractType& dst_type,
                                 const String& dst_name,
                                 LocationSummary* locs);
 
   void GenerateInstanceOf(intptr_t deopt_id,
                           intptr_t token_pos,
-                          intptr_t try_index,
                           const AbstractType& type,
                           bool negate_result,
                           LocationSummary* locs);
 
   void GenerateInstanceCall(intptr_t deopt_id,
                             intptr_t token_pos,
-                            intptr_t try_index,
                             const String& function_name,
                             intptr_t argument_count,
                             const Array& argument_names,
@@ -114,7 +109,6 @@ class FlowGraphCompiler : public ValueObject {
 
   void GenerateStaticCall(intptr_t deopt_id,
                           intptr_t token_pos,
-                          intptr_t try_index,
                           const Function& function,
                           intptr_t argument_count,
                           const Array& argument_names,
@@ -145,7 +139,6 @@ class FlowGraphCompiler : public ValueObject {
                         intptr_t argument_count,
                         intptr_t deopt_id,
                         intptr_t token_pos,
-                        intptr_t try_index,
                         LocationSummary* locs);
 
   void EmitLoadIndexedGeneric(LoadIndexedComp* comp);
@@ -156,7 +149,6 @@ class FlowGraphCompiler : public ValueObject {
                        Label* deopt,
                        intptr_t deopt_id,
                        intptr_t token_index,
-                       intptr_t try_index,
                        LocationSummary* locs);
 
   void EmitDoubleCompareBranch(Condition true_condition,
@@ -180,8 +172,7 @@ class FlowGraphCompiler : public ValueObject {
   void AddExceptionHandler(intptr_t try_index, intptr_t pc_offset);
   void AddCurrentDescriptor(PcDescriptors::Kind kind,
                             intptr_t deopt_id,
-                            intptr_t token_pos,
-                            intptr_t try_index);
+                            intptr_t token_pos);
 
   void RecordSafepoint(LocationSummary* locs);
 
@@ -208,6 +199,13 @@ class FlowGraphCompiler : public ValueObject {
   // Returns true if the compiled function has a finally clause.
   bool HasFinally() const;
 
+  intptr_t CurrentTryIndex() const {
+    if (current_block_ == NULL) {
+      return CatchClauseNode::kInvalidTryIndex;
+    }
+    return current_block_->try_index();
+  }
+
   static const int kLocalsOffsetFromFP = (-1 * kWordSize);
 
  private:
@@ -225,7 +223,6 @@ class FlowGraphCompiler : public ValueObject {
                       intptr_t argument_count,
                       intptr_t deopt_id,
                       intptr_t token_pos,
-                      intptr_t try_index,
                       LocationSummary* locs);
 
   // Type checking helper methods.