Eliminate try-index for deopt stubs.

runtime/vm/flow_graph_compiler.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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 221 matching lines @@
                                        try_index);
 }
 
 
 void FlowGraphCompiler::AddDeoptIndexAtCall(intptr_t deopt_id,
                                             intptr_t token_pos) {
   // TODO(srdjan): Temporary use deopt stubs to maintain deopt-indexes.
   // kDeoptAtCall will not emit code, but will only generate deoptimization
   // information.
   const intptr_t deopt_index = deopt_stubs_.length();
-  const intptr_t kNoTryIndex = -1;
-  AddDeoptStub(deopt_id, kNoTryIndex, kDeoptAtCall);
+  AddDeoptStub(deopt_id, kDeoptAtCall);
   pc_descriptors_list()->AddDescriptor(PcDescriptors::kDeoptIndex,
                                        assembler()->CodeSize(),
                                        deopt_id,
                                        token_pos,
                                        deopt_index);
 }
 
 
 void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
   if (is_optimizing()) {
     BitmapBuilder* bitmap = locs->stack_bitmap();
     ASSERT(bitmap != NULL);
     bitmap->SetLength(StackSize());
     stackmap_table_builder_->AddEntry(assembler()->CodeSize(), bitmap);
   }
 }
 
 
 Label* FlowGraphCompiler::AddDeoptStub(intptr_t deopt_id,
-                                       intptr_t try_index,
                                        DeoptReasonId reason) {
-  DeoptimizationStub* stub =
-      new DeoptimizationStub(deopt_id, try_index, reason);
+  DeoptimizationStub* stub = new DeoptimizationStub(deopt_id, reason);
   ASSERT(is_optimizing_);
   ASSERT(pending_deoptimization_env_ != NULL);
   stub->set_deoptimization_env(pending_deoptimization_env_);
   deopt_stubs_.Add(stub);
   return stub->entry_label();
 }
 
 
 void FlowGraphCompiler::FinalizeExceptionHandlers(const Code& code) {
   ASSERT(exception_handlers_list_ != NULL);
@@ skipping 473 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart