Reapply "Shuffle around deopt id allocation...

runtime/vm/regexp_assembler_ir.h

 // Copyright (c) 2014, 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.
 
 #ifndef RUNTIME_VM_REGEXP_ASSEMBLER_IR_H_
 #define RUNTIME_VM_REGEXP_ASSEMBLER_IR_H_
 
 #include "vm/assembler.h"
 #include "vm/intermediate_language.h"
 #include "vm/object.h"
@@ skipping 114 matching lines @@
 
   // Generate a dispatch block implementing backtracking. Must be done after
   // graph construction.
   void GenerateBacktrackBlock();
 
   // Allocate the actual registers array once its size is known. Must be done
   // after graph construction.
   void FinalizeRegistersArray();
 
  private:
+  intptr_t GetNextDeoptId() const { return thread_->GetNextDeoptId(); }
+
   // Generate the contents of preset blocks. The entry block is the entry point
   // of the generated code.
   void GenerateEntryBlock();
   // Copies capture indices into the result area and returns true.
   void GenerateSuccessBlock();
   // Returns false.
   void GenerateExitBlock();
 
   enum ComparisonKind {
     kEQ,
@@ skipping 207 matching lines @@
     }
     void Dealloc(intptr_t count = 1) {
       ASSERT(count <= next_id);
       next_id -= count;
     }
 
    private:
     intptr_t next_id;
   };
 
+  Thread* thread_;
+
   // Which mode to generate code for (ASCII or UC16).
   Mode mode_;
 
   // Which specific string class to generate code for.
   intptr_t specialization_cid_;
 
   // Block entries used internally.
   GraphEntryInstr* entry_block_;
   JoinEntryInstr* start_block_;
   JoinEntryInstr* success_block_;
@@ skipping 59 matching lines @@
   IdAllocator temp_id_;
   IdAllocator arg_id_;
   IdAllocator local_id_;
   IdAllocator indirect_id_;
 };
 
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_REGEXP_ASSEMBLER_IR_H_