[turbofan] Put StructuredGraphBuilder out of its misery and merge its remnants back into the AstGra…

test/cctest/compiler/raw-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_COMPILER_RAW_MACHINE_ASSEMBLER_H_
 #define V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_
 
 #include "src/v8.h"
 
 #include "src/compiler/common-operator.h"
-#include "src/compiler/graph-builder.h"
+#include "src/compiler/graph.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/operator.h"
-
+#include "test/cctest/compiler/graph-builder.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class BasicBlock;
 class Schedule;
 
-
 class RawMachineAssembler : public GraphBuilder {
  public:
   class Label {
    public:
     Label() : block_(NULL), used_(false), bound_(false) {}
     ~Label() { DCHECK(bound_ || !used_); }
 
     BasicBlock* block() { return block_; }
 
    private:
     // Private constructor for exit label.
     explicit Label(BasicBlock* block)
         : block_(block), used_(false), bound_(false) {}
 
     BasicBlock* block_;
     bool used_;
     bool bound_;
     friend class RawMachineAssembler;
     DISALLOW_COPY_AND_ASSIGN(Label);
   };
 
   RawMachineAssembler(Isolate* isolate, Graph* graph,
                       MachineSignature* machine_sig,
                       MachineType word = kMachPtr,
                       MachineOperatorBuilder::Flags flags =
                           MachineOperatorBuilder::Flag::kNoFlags);
-  ~RawMachineAssembler() OVERRIDE {}
+  ~RawMachineAssembler() {}
 
   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_; }
 
   Node* UndefinedConstant() {
     Unique<HeapObject> unique = Unique<HeapObject>::CreateImmovable(
@@ skipping 360 matching lines @@
     return NewNode(common()->Phi(type, 3), n1, n2, n3);
   }
   Node* Phi(MachineType type, Node* n1, Node* n2, Node* n3, Node* n4) {
     return NewNode(common()->Phi(type, 4), n1, n2, n3, n4);
   }
 
   // MachineAssembler is invalid after export.
   Schedule* Export();
 
  protected:
-  Node* MakeNode(const Operator* op, int input_count, Node** inputs,
-                 bool incomplete) FINAL;
+  virtual Node* MakeNode(const Operator* op, int value_input_count,
+                         Node** value_inputs, bool incomplete) FINAL;
 
   bool ScheduleValid() { return schedule_ != NULL; }
 
   Schedule* schedule() {
     DCHECK(ScheduleValid());
     return schedule_;
   }
 
  private:
   BasicBlock* Use(Label* label);
   BasicBlock* EnsureBlock(Label* label);
   BasicBlock* CurrentBlock();
 
+  Isolate* isolate_;
+  Graph* graph_;
   Schedule* schedule_;
   MachineOperatorBuilder machine_;
   CommonOperatorBuilder common_;
   MachineSignature* machine_sig_;
   CallDescriptor* call_descriptor_;
   Node** parameters_;
   Label exit_label_;
   BasicBlock* current_block_;
 
   DISALLOW_COPY_AND_ASSIGN(RawMachineAssembler);
 };
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_COMPILER_RAW_MACHINE_ASSEMBLER_H_