Reapply "Shuffle around deopt id allocation...

runtime/vm/intrinsifier.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.
 // Class for intrinsifying functions.
 
 #include "vm/assembler.h"
 #include "vm/compiler.h"
 #include "vm/cpu.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
@@ skipping 152 matching lines @@
                                    FlowGraphCompiler* compiler) {
 #if !defined(TARGET_ARCH_DBC)
   ZoneGrowableArray<const ICData*>* ic_data_array =
       new ZoneGrowableArray<const ICData*>();
   FlowGraphBuilder builder(parsed_function, *ic_data_array,
                            NULL,  // NULL = not inlining.
                            Compiler::kNoOSRDeoptId);
 
   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);
   const Function& function = parsed_function.function();
   switch (function.recognized_kind()) {
 #define EMIT_CASE(class_name, function_name, enum_name, type, fp)              \
   case MethodRecognizer::k##enum_name:                                         \
     if (!Build_##enum_name(graph)) return false;                               \
     break;
 
@@ skipping 127 matching lines @@
       // Since we use the presence of an environment to determine if an
       // instructions can deoptimize, we need an empty environment for
       // instructions that "deoptimize" to the intrinsic fall-through code.
       instr->SetEnvironment(fall_through_env_);
     }
     current_ = current_->AppendInstruction(instr);
     return instr;
   }
 
   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);
   }
 
   Definition* AddParameter(intptr_t index) {
     intptr_t adjustment = Intrinsifier::ParameterSlotFromSp();
     return AddToInitialDefinitions(new ParameterInstr(
         adjustment + index, flow_graph_->graph_entry(), SPREG));
   }
 
@@ skipping 839 matching lines @@
 }
 
 
 void Intrinsifier::RegExp_ExecuteMatchSticky(Assembler* assembler) {
   IntrinsifyRegExpExecuteMatch(assembler, /*sticky=*/true);
 }
 #endif  // !defined(TARGET_ARCH_DBC)
 
 
 }  // namespace dart