[turbofan] Cleanup Schedule and related classes.

test/cctest/compiler/test-scheduler.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 "src/compiler/access-builder.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/graph-visualizer.h"
@@ skipping 68 matching lines @@
     loop->nodes[i] = schedule->NewBasicBlock();
     if (i > 0) {
       schedule->AddSuccessorForTesting(loop->nodes[i - 1], loop->nodes[i]);
     }
   }
   schedule->AddSuccessorForTesting(loop->nodes[count - 1], loop->nodes[0]);
   return loop;
 }
 
 
-static int GetScheduledNodeCount(Schedule* schedule) {
-  int node_count = 0;
-  for (BasicBlockVectorIter i = schedule->rpo_order()->begin();
-       i != schedule->rpo_order()->end(); ++i) {
-    BasicBlock* block = *i;
-    for (BasicBlock::const_iterator j = block->begin(); j != block->end();
-         ++j) {
-      ++node_count;
-    }
-    BasicBlock::Control control = block->control();
-    if (control != BasicBlock::kNone) {
-      ++node_count;
-    }
+static int GetScheduledNodeCount(const Schedule* schedule) {
+  size_t node_count = 0;
+  for (auto block : *schedule->rpo_order()) {
+    node_count += block->NodeCount();
+    if (block->control() != BasicBlock::kNone) ++node_count;
   }
-  return node_count;
+  return static_cast<int>(node_count);
 }
 
 
 static Schedule* ComputeAndVerifySchedule(int expected, Graph* graph) {
   if (FLAG_trace_turbo) {
     OFStream os(stdout);
     os << AsDOT(*graph);
   }
 
   Schedule* schedule = Scheduler::ComputeSchedule(graph->zone(), graph);
@@ skipping 2001 matching lines @@
   graph.SetEnd(end);
 
   Schedule* schedule = ComputeAndVerifySchedule(6, &graph);
   BasicBlock* block = schedule->block(loop);
   CHECK_NE(NULL, loop);
   CHECK_EQ(block, schedule->block(effect));
   CHECK_GE(block->rpo_number(), 0);
 }
 
 #endif