[turbofan] store block id with instruction

src/compiler/instruction.h

Index: src/compiler/instruction.h
diff --git a/src/compiler/instruction.h b/src/compiler/instruction.h
index 70338858a583df27ac546c83e1f1636ab16ba062..768a43d7c77d5e300f08a65d12ff12a72591d12d 100644
--- a/src/compiler/instruction.h
+++ b/src/compiler/instruction.h
@@ -857,6 +857,9 @@ class Instruction final {
   ParallelMove* const* parallel_moves() const { return &parallel_moves_[0]; }
   ParallelMove** parallel_moves() { return &parallel_moves_[0]; }
 
+  int block_id() const { return block_id_; }

[titzer, 2016/04/19 08:05:17]

Maybe a DCHECK_NE(kInvalidRpoNumber, block_id_)

[Mircea Trofin, 2016/04/19 15:39:13]

Done.

+  void set_block_id(int id) { block_id_ = id; }
+
   void Print(const RegisterConfiguration* config) const;
   void Print() const;
 
@@ -877,6 +880,7 @@ class Instruction final {
   uint32_t bit_field_;
   ParallelMove* parallel_moves_[2];
   ReferenceMap* reference_map_;
+  int block_id_;
   InstructionOperand operands_[1];
 
   DISALLOW_COPY_AND_ASSIGN(Instruction);
@@ -1303,6 +1307,8 @@ class InstructionSequence final : public ZoneObject {
   void StartBlock(RpoNumber rpo);
   void EndBlock(RpoNumber rpo);
 
+  void FinishInstructionMap();
+
   int AddConstant(int virtual_register, Constant constant) {
     // TODO(titzer): allow RPO numbers as constants?
     DCHECK(constant.type() != Constant::kRpoNumber);
@@ -1394,7 +1400,6 @@ class InstructionSequence final : public ZoneObject {
   Zone* const zone_;
   InstructionBlocks* const instruction_blocks_;
   SourcePositionMap source_positions_;
-  IntVector block_starts_;
   ConstantMap constants_;
   Immediates immediates_;
   InstructionDeque instructions_;