Remove duplication in Scheduler and simplify interface. Make ComputeSchedule() and ComputeSpecialRP…

src/compiler/scheduler.h

 // 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.
 
 #ifndef V8_COMPILER_SCHEDULER_H_
 #define V8_COMPILER_SCHEDULER_H_
 
 #include <vector>
 
 #include "src/v8.h"
 
 #include "src/compiler/opcodes.h"
 #include "src/compiler/schedule.h"
 #include "src/zone-allocator.h"
 #include "src/zone-containers.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
+// Computes a schedule from a graph, placing nodes into basic blocks and
+// ordering the basic blocks in the special RPO order.
 class Scheduler {
  public:
-  explicit Scheduler(Zone* zone);
-  Scheduler(Zone* zone, Graph* graph, Schedule* schedule);
+  // Create a new schedule and place all computations from the graph in it.
+  static Schedule* ComputeSchedule(Graph* graph);
 
-  Schedule* NewSchedule(Graph* graph);
-
-  BasicBlockVector* ComputeSpecialRPO();
+  // Compute the RPO of blocks in an existing schedule.
+  static BasicBlockVector* ComputeSpecialRPO(Schedule* schedule);
 
  private:
   Zone* zone_;
   Graph* graph_;
   Schedule* schedule_;
   NodeVector branches_;
   NodeVector calls_;
   NodeVector deopts_;
   NodeVector returns_;
   NodeVector loops_and_merges_;
   BasicBlockVector node_block_placement_;
   IntVector unscheduled_uses_;
   NodeVectorVector scheduled_nodes_;
   NodeVector schedule_root_nodes_;
   IntVector schedule_early_rpo_index_;
 
+  Scheduler(Zone* zone, Graph* graph, Schedule* schedule);
+
   int GetRPONumber(BasicBlock* block) {
     DCHECK(block->rpo_number_ >= 0 &&
            block->rpo_number_ < static_cast<int>(schedule_->rpo_order_.size()));
     DCHECK(schedule_->rpo_order_[block->rpo_number_] == block);
     return block->rpo_number_;
   }
 
   void PrepareAuxiliaryNodeData();
   void PrepareAuxiliaryBlockData();
 
@@ skipping 18 matching lines @@
   void PrepareUses();
 
   friend class ScheduleLateNodeVisitor;
   void ScheduleLate();
 };
 }
 }
 }  // namespace v8::internal::compiler
 
 #endif  // V8_COMPILER_SCHEDULER_H_