Reapply "Shuffle around deopt id allocation...

runtime/vm/constant_propagator.cc

 // Copyright (c) 2013, 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/constant_propagator.h"
 
 #include "vm/bit_vector.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
 #include "vm/flow_graph_range_analysis.h"
@@ skipping 1533 matching lines @@
       ASSERT(branch->previous() != NULL);  // Not already eliminated.
       BlockEntryInstr* if_true =
           FindFirstNonEmptySuccessor(branch->true_successor(), empty_blocks);
       BlockEntryInstr* if_false =
           FindFirstNonEmptySuccessor(branch->false_successor(), empty_blocks);
       if (if_true == if_false) {
         // Replace the branch with a jump to the common successor.
         // Drop the comparison, which does not have side effects
         JoinEntryInstr* join = if_true->AsJoinEntry();
         if (join->phis() == NULL) {
-          GotoInstr* jump = new (Z) GotoInstr(if_true->AsJoinEntry());
+          GotoInstr* jump =
+              new (Z) GotoInstr(if_true->AsJoinEntry(), Thread::kNoDeoptId);
           jump->InheritDeoptTarget(Z, branch);
 
           Instruction* previous = branch->previous();
           branch->set_previous(NULL);
           previous->LinkTo(jump);
 
           // Remove uses from branch and all the empty blocks that
           // are now unreachable.
           branch->UnuseAllInputs();
           for (BitVector::Iterator it(empty_blocks); !it.Done(); it.Advance()) {
@@ skipping 122 matching lines @@
     if (branch != NULL) {
       TargetEntryInstr* if_true = branch->true_successor();
       TargetEntryInstr* if_false = branch->false_successor();
       JoinEntryInstr* join = NULL;
       Instruction* next = NULL;
 
       if (!reachable_->Contains(if_true->preorder_number())) {
         ASSERT(reachable_->Contains(if_false->preorder_number()));
         ASSERT(if_false->parallel_move() == NULL);
         ASSERT(if_false->loop_info() == NULL);
-        join =
-            new (Z) JoinEntryInstr(if_false->block_id(), if_false->try_index());
+        join = new (Z) JoinEntryInstr(
+            if_false->block_id(), if_false->try_index(), Thread::kNoDeoptId);
         join->InheritDeoptTarget(Z, if_false);
         if_false->UnuseAllInputs();
         next = if_false->next();
       } else if (!reachable_->Contains(if_false->preorder_number())) {
         ASSERT(if_true->parallel_move() == NULL);
         ASSERT(if_true->loop_info() == NULL);
-        join =
-            new (Z) JoinEntryInstr(if_true->block_id(), if_true->try_index());
+        join = new (Z) JoinEntryInstr(if_true->block_id(), if_true->try_index(),
+                                      Thread::kNoDeoptId);
         join->InheritDeoptTarget(Z, if_true);
         if_true->UnuseAllInputs();
         next = if_true->next();
       }
 
       if (join != NULL) {
         // Replace the branch with a jump to the reachable successor.
         // Drop the comparison, which does not have side effects as long
         // as it is a strict compare (the only one we can determine is
         // constant with the current analysis).
-        GotoInstr* jump = new (Z) GotoInstr(join);
+        GotoInstr* jump = new (Z) GotoInstr(join, Thread::kNoDeoptId);
         jump->InheritDeoptTarget(Z, branch);
 
         Instruction* previous = branch->previous();
         branch->set_previous(NULL);
         previous->LinkTo(jump);
 
         // Replace the false target entry with the new join entry. We will
         // recompute the dominators after this pass.
         join->LinkTo(next);
         branch->UnuseAllInputs();
       }
     }
   }
 
   graph_->DiscoverBlocks();
   graph_->MergeBlocks();
   GrowableArray<BitVector*> dominance_frontier;
   graph_->ComputeDominators(&dominance_frontier);
 
   if (FLAG_trace_constant_propagation &&
       FlowGraphPrinter::ShouldPrint(graph_->function())) {
     FlowGraphPrinter::PrintGraph("After CP", graph_);
   }
 }
 
 }  // namespace dart