Shuffle around deopt id allocation to give the flow graph builder a chance to record other data as …

runtime/vm/kernel_binary_flowgraph.cc

 // Copyright (c) 2016, 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/kernel_binary_flowgraph.h"
 
 #include "vm/longjump.h"
 #include "vm/object_store.h"
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
@@ skipping 3536 matching lines @@
   body += BuildStatement();  // read body.
 
   Instruction* entry;
   if (body.is_open()) {
     JoinEntryInstr* join = BuildJoinEntry();
     body += Goto(join);
 
     Fragment loop(join);
     loop += CheckStackOverflow();
     loop += condition;
-    entry = new (Z) GotoInstr(join);
+    entry = new (Z) GotoInstr(join, Thread::Current()->GetNextDeoptId());
   } else {
     entry = condition.entry;
   }
 
 
   loop_depth_dec();
   return Fragment(entry, loop_exit);
 }
 
 Fragment StreamingFlowGraphBuilder::BuildDoStatement() {
@@ skipping 13 matching lines @@
   loop += body;
   loop += TranslateCondition(&negate);  // read condition.
   TargetEntryInstr* loop_repeat;
   TargetEntryInstr* loop_exit;
   loop += BranchIfTrue(&loop_repeat, &loop_exit, negate);
 
   Fragment repeat(loop_repeat);
   repeat += Goto(join);
 
   loop_depth_dec();
-  return Fragment(new (Z) GotoInstr(join), loop_exit);
+  return Fragment(new (Z) GotoInstr(join, Thread::Current()->GetNextDeoptId()),
+                  loop_exit);
 }
 
 Fragment StreamingFlowGraphBuilder::BuildForStatement() {
   intptr_t offset = ReaderOffset() - 1;  // Include the tag.
 
   Fragment declarations;
 
   bool new_context = false;
   declarations += EnterScope(offset, &new_context);
 
@@ skipping 715 matching lines @@
   }
   instructions += StoreLocal(position, variable);
   instructions += Drop();
   return instructions;
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)