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

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

Index: test/cctest/compiler/raw-machine-assembler.h
diff --git a/src/compiler/raw-machine-assembler.h b/test/cctest/compiler/raw-machine-assembler.h
similarity index 98%
copy from src/compiler/raw-machine-assembler.h
copy to test/cctest/compiler/raw-machine-assembler.h
index 7b4644497ea9feb1c85047e0b4be74bc51efa024..c4f9cef0bec54892ea32fcf7c202030faa4368a2 100644
--- a/src/compiler/raw-machine-assembler.h
+++ b/test/cctest/compiler/raw-machine-assembler.h
@@ -8,12 +8,12 @@
 #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 {
@@ -22,7 +22,6 @@ namespace compiler {
 class BasicBlock;
 class Schedule;
 
-
 class RawMachineAssembler : public GraphBuilder {
  public:
   class Label {
@@ -49,7 +48,7 @@ class RawMachineAssembler : public GraphBuilder {
                       MachineType word = kMachPtr,
                       MachineOperatorBuilder::Flags flags =
                           MachineOperatorBuilder::Flag::kNoFlags);
-  ~RawMachineAssembler() OVERRIDE {}
+  ~RawMachineAssembler() {}
 
   Zone* zone() const { return graph()->zone(); }
   MachineOperatorBuilder* machine() { return &machine_; }
@@ -430,8 +429,8 @@ class RawMachineAssembler : public GraphBuilder {
   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; }
 
@@ -445,6 +444,8 @@ class RawMachineAssembler : public GraphBuilder {
   BasicBlock* EnsureBlock(Label* label);
   BasicBlock* CurrentBlock();
 
+  Isolate* isolate_;
+  Graph* graph_;
   Schedule* schedule_;
   MachineOperatorBuilder machine_;
   CommonOperatorBuilder common_;