[turbofan] remove dependence of InstructionBlock on BasicBlock

src/compiler/schedule.cc

 // Copyright 2013 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/compiler/schedule.h"
 
 #include "src/compiler/node.h"
 #include "src/compiler/node-properties.h"
 #include "src/ostreams.h"
 
@@ skipping 103 matching lines @@
   UNREACHABLE();
   return os;
 }
 
 
 std::ostream& operator<<(std::ostream& os, const BasicBlock::Id& id) {
   return os << id.ToSize();
 }
 
 
-std::ostream& operator<<(std::ostream& os, const BasicBlock::RpoNumber& rpo) {
-  return os << rpo.ToSize();
-}
-
-
 Schedule::Schedule(Zone* zone, size_t node_count_hint)
     : zone_(zone),
       all_blocks_(zone),
       nodeid_to_block_(zone),
       rpo_order_(zone),
       start_(NewBasicBlock()),
       end_(NewBasicBlock()) {
   nodeid_to_block_.reserve(node_count_hint);
 }
 
@@ skipping 173 matching lines @@
   int length = static_cast<int>(nodeid_to_block_.size());
   if (node->id() >= length) {
     nodeid_to_block_.resize(node->id() + 1);
   }
   nodeid_to_block_[node->id()] = block;
 }
 
 
 std::ostream& operator<<(std::ostream& os, const Schedule& s) {
   for (BasicBlock* block : *s.rpo_order()) {
-    os << "--- BLOCK B" << block->id();
+    os << "--- BLOCK B" << block->rpo_number();
     if (block->deferred()) os << " (deferred)";
     if (block->PredecessorCount() != 0) os << " <- ";
     bool comma = false;
     for (BasicBlock const* predecessor : block->predecessors()) {
       if (comma) os << ", ";
       comma = true;
-      os << "B" << predecessor->id();
+      os << "B" << predecessor->rpo_number();
     }
     os << " ---\n";
     for (Node* node : *block) {
       os << "  " << *node;
       if (NodeProperties::IsTyped(node)) {
         Bounds bounds = NodeProperties::GetBounds(node);
         os << " : ";
         bounds.lower->PrintTo(os);
         if (!bounds.upper->Is(bounds.lower)) {
           os << "..";
           bounds.upper->PrintTo(os);
         }
       }
       os << "\n";
     }
     BasicBlock::Control control = block->control();
     if (control != BasicBlock::kNone) {
       os << "  ";
       if (block->control_input() != NULL) {
         os << *block->control_input();
       } else {
         os << "Goto";
       }
       os << " -> ";
       comma = false;
       for (BasicBlock const* successor : block->successors()) {
         if (comma) os << ", ";
         comma = true;
-        os << "B" << successor->id();
+        os << "B" << successor->rpo_number();
       }
       os << "\n";
     }
   }
   return os;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8