Reapply "Shuffle around deopt id allocation...

runtime/vm/intrinsifier.cc

Index: runtime/vm/intrinsifier.cc
diff --git a/runtime/vm/intrinsifier.cc b/runtime/vm/intrinsifier.cc
index 0ef00b27fd43e6177cfda00309ff3b5ec7410edc..de5ccd2282c0a13d8303584eec8e24e6b69f34bc 100644
--- a/runtime/vm/intrinsifier.cc
+++ b/runtime/vm/intrinsifier.cc
@@ -170,7 +170,8 @@ bool Intrinsifier::GraphIntrinsify(const ParsedFunction& parsed_function,
 
   intptr_t block_id = builder.AllocateBlockId();
   TargetEntryInstr* normal_entry =
-      new TargetEntryInstr(block_id, CatchClauseNode::kInvalidTryIndex);
+      new TargetEntryInstr(block_id, CatchClauseNode::kInvalidTryIndex,
+                           Thread::Current()->GetNextDeoptId());
   GraphEntryInstr* graph_entry = new GraphEntryInstr(
       parsed_function, normal_entry, Compiler::kNoOSRDeoptId);
   FlowGraph* graph = new FlowGraph(parsed_function, graph_entry, block_id);
@@ -318,7 +319,8 @@ class BlockBuilder : public ValueObject {
   }
 
   void AddIntrinsicReturn(Value* value) {
-    ReturnInstr* instr = new ReturnInstr(TokenPos(), value);
+    ReturnInstr* instr =
+        new ReturnInstr(TokenPos(), value, Thread::Current()->GetNextDeoptId());
     AddInstruction(instr);
     entry_->set_last_instruction(instr);
   }