Remove overly complex MachineNodeFactory.

test/cctest/compiler/structured-machine-assembler.h

 // 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.
 
 #ifndef V8_CCTEST_COMPILER_STRUCTURED_MACHINE_ASSEMBLER_H_
 #define V8_CCTEST_COMPILER_STRUCTURED_MACHINE_ASSEMBLER_H_
 
 #include "src/v8.h"
 
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph-builder.h"
-#include "src/compiler/machine-node-factory.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
+#include "src/compiler/raw-machine-assembler.h"
 
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class BasicBlock;
 class Schedule;
 class StructuredMachineAssembler;
 
 
 class Variable : public ZoneObject {
  public:
   Node* Get() const;
   void Set(Node* value) const;
 
  private:
   Variable(StructuredMachineAssembler* smasm, int offset)
       : smasm_(smasm), offset_(offset) {}
 
   friend class StructuredMachineAssembler;
   friend class StructuredMachineAssemblerFriend;
   StructuredMachineAssembler* const smasm_;
   const int offset_;
 };
 
 
-class StructuredMachineAssembler
-    : public GraphBuilder,
-      public MachineNodeFactory<StructuredMachineAssembler> {
+class StructuredMachineAssembler : public RawMachineAssembler {
  public:
   class Environment : public ZoneObject {
    public:
     Environment(Zone* zone, BasicBlock* block, bool is_dead_);
 
    private:
     BasicBlock* block_;
     NodeVector variables_;
     bool is_dead_;
     friend class StructuredMachineAssembler;
     DISALLOW_COPY_AND_ASSIGN(Environment);
   };
 
   class IfBuilder;
   friend class IfBuilder;
   class LoopBuilder;
   friend class LoopBuilder;
 
   StructuredMachineAssembler(Graph* graph, MachineSignature* machine_sig,
                              MachineType word = kMachPtr);
   virtual ~StructuredMachineAssembler() {}
 
-  Isolate* isolate() const { return zone()->isolate(); }
-  Zone* zone() const { return graph()->zone(); }
-  MachineOperatorBuilder* machine() { return &machine_; }
-  CommonOperatorBuilder* common() { return &common_; }
-  CallDescriptor* call_descriptor() const { return call_descriptor_; }
-  size_t parameter_count() const { return machine_sig_->parameter_count(); }
-  MachineSignature* machine_sig() const { return machine_sig_; }
-
-  // Parameters.
-  Node* Parameter(size_t index);
   // Variables.
   Variable NewVariable(Node* initial_value);
   // Control flow.
   void Return(Node* value);
 
-  // MachineAssembler is invalid after export.
-  Schedule* Export();
-
  protected:
   virtual Node* MakeNode(Operator* op, int input_count, Node** inputs);
 
-  Schedule* schedule() {
-    DCHECK(ScheduleValid());
-    return schedule_;
-  }
-
  private:
-  bool ScheduleValid() { return schedule_ != NULL; }
-
   typedef ZoneVector<Environment*> EnvironmentVector;
 
   NodeVector* CurrentVars() { return &current_environment_->variables_; }
   Node*& VariableAt(Environment* environment, int offset);
   Node* GetVariable(int offset);
   void SetVariable(int offset, Node* value);
 
   void AddBranch(Environment* environment, Node* condition,
                  Environment* true_val, Environment* false_val);
   void AddGoto(Environment* from, Environment* to);
   BasicBlock* TrampolineFor(BasicBlock* block);
 
   void CopyCurrentAsDead();
   Environment* Copy(Environment* environment) {
     return Copy(environment, static_cast<int>(environment->variables_.size()));
   }
   Environment* Copy(Environment* environment, int truncate_at);
   void Merge(EnvironmentVector* environments, int truncate_at);
   Environment* CopyForLoopHeader(Environment* environment);
   void MergeBackEdgesToLoopHeader(Environment* header,
                                   EnvironmentVector* environments);
 
-  Schedule* schedule_;
-  MachineOperatorBuilder machine_;
-  CommonOperatorBuilder common_;
-  MachineSignature* machine_sig_;
-  CallDescriptor* call_descriptor_;
-  Node** parameters_;
   Environment* current_environment_;
   int number_of_variables_;
 
   friend class Variable;
   // For testing only.
   friend class StructuredMachineAssemblerFriend;
   DISALLOW_COPY_AND_ASSIGN(StructuredMachineAssembler);
 };
 
 // IfBuilder constructs of nested if-else expressions which more or less follow
@@ skipping 155 matching lines @@
   EnvironmentVector pending_header_merges_;
   EnvironmentVector pending_exit_merges_;
   DISALLOW_COPY_AND_ASSIGN(LoopBuilder);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CCTEST_COMPILER_STRUCTURED_MACHINE_ASSEMBLER_H_