Reapply "Shuffle around deopt id allocation...

runtime/vm/intermediate_language_test.cc

Index: runtime/vm/intermediate_language_test.cc
diff --git a/runtime/vm/intermediate_language_test.cc b/runtime/vm/intermediate_language_test.cc
index 61b9e0507e342459d93266a9fc31cc5245222465..46b916f451a07d2dc3b011cbebdc233ac6cdc9de 100644
--- a/runtime/vm/intermediate_language_test.cc
+++ b/runtime/vm/intermediate_language_test.cc
@@ -8,19 +8,19 @@
 namespace dart {
 
 TEST_CASE(InstructionTests) {
-  TargetEntryInstr* target_instr =
-      new TargetEntryInstr(1, CatchClauseNode::kInvalidTryIndex);
+  TargetEntryInstr* target_instr = new TargetEntryInstr(
+      1, CatchClauseNode::kInvalidTryIndex, Thread::kNoDeoptId);
   EXPECT(target_instr->IsBlockEntry());
   EXPECT(!target_instr->IsDefinition());
-  CurrentContextInstr* context = new CurrentContextInstr();
+  CurrentContextInstr* context = new CurrentContextInstr(Thread::kNoDeoptId);
   EXPECT(context->IsDefinition());
   EXPECT(!context->IsBlockEntry());
 }
 
 
 TEST_CASE(OptimizationTests) {
-  JoinEntryInstr* join =
-      new JoinEntryInstr(1, CatchClauseNode::kInvalidTryIndex);
+  JoinEntryInstr* join = new JoinEntryInstr(
+      1, CatchClauseNode::kInvalidTryIndex, Thread::kNoDeoptId);
 
   Definition* def1 = new PhiInstr(join, 0);
   Definition* def2 = new PhiInstr(join, 0);