[turbofan] remove dependence of InstructionBlock on BasicBlock

test/cctest/compiler/test-jump-threading.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/compiler/instruction.h"
 #include "src/compiler/instruction-codes.h"
 #include "src/compiler/jump-threading.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
-typedef BasicBlock::RpoNumber RpoNumber;
+typedef RpoNumber RpoNumber;

[Michael Starzinger, 2015/02/25 14:59:37]

nit: Redundant typedef is redundant.

[dcarney, 2015/02/25 16:08:26]

Done.

 
 class TestCode : public HandleAndZoneScope {
  public:
   TestCode()
       : HandleAndZoneScope(),
         blocks_(main_zone()),
         sequence_(main_isolate(), main_zone(), &blocks_),
         rpo_number_(RpoNumber::FromInt(0)),
         current_(NULL) {}
 
@@ skipping 53 matching lines @@
     sequence_.EndBlock(current_->rpo_number());
     current_ = NULL;
     rpo_number_ = RpoNumber::FromInt(rpo_number_.ToInt() + 1);
   }
   InstructionOperand UseRpo(int num) {
     int index = sequence_.AddImmediate(Constant(RpoNumber::FromInt(num)));
     return ImmediateOperand(index);
   }
   void Start(bool deferred = false) {
     if (current_ == NULL) {
-      current_ = new (main_zone()) InstructionBlock(
-          main_zone(), BasicBlock::Id::FromInt(rpo_number_.ToInt()),
-          rpo_number_, RpoNumber::Invalid(), RpoNumber::Invalid(), deferred);
+      current_ = new (main_zone())
+          InstructionBlock(main_zone(), rpo_number_, RpoNumber::Invalid(),
+                           RpoNumber::Invalid(), deferred);
       blocks_.push_back(current_);
       sequence_.StartBlock(rpo_number_);
     }
   }
   void Defer() {
     CHECK(current_ == NULL);
     Start(true);
   }
 };
 
@@ skipping 652 matching lines @@
         for (int k = 4; k < 5; k++) assembly[k]--;
       }
       CheckAssemblyOrder(code, 5, assembly);
     }
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8