Revert "Switch inlining to use simplified instead of machine loads.", "Fix size_t to int conversion…

src/compiler/js-graph.h

Index: src/compiler/js-graph.h
diff --git a/src/compiler/js-graph.h b/src/compiler/js-graph.h
index 99a6a06786bb26c473e3d61c9f63651a84703e55..71d64345d531c26ae00d4ad9a72d49147c72bb9f 100644
--- a/src/compiler/js-graph.h
+++ b/src/compiler/js-graph.h
@@ -9,7 +9,6 @@
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/js-operator.h"
-#include "src/compiler/machine-operator.h"
 #include "src/compiler/node-properties.h"
 
 namespace v8 {
@@ -23,14 +22,11 @@ class Typer;
 // constants, and various helper methods.
 class JSGraph : public ZoneObject {
  public:
-  JSGraph(Graph* graph, CommonOperatorBuilder* common,
-          JSOperatorBuilder* javascript, Typer* typer,
-          MachineOperatorBuilder* machine)
+  JSGraph(Graph* graph, CommonOperatorBuilder* common, Typer* typer)
       : graph_(graph),
         common_(common),
-        javascript_(javascript),
+        javascript_(zone()),
         typer_(typer),
-        machine_(machine),
         cache_(zone()) {}
 
   // Canonicalized global constants.
@@ -77,9 +73,8 @@ class JSGraph : public ZoneObject {
     return Constant(immediate);
   }
 
-  JSOperatorBuilder* javascript() { return javascript_; }
+  JSOperatorBuilder* javascript() { return &javascript_; }
   CommonOperatorBuilder* common() { return common_; }
-  MachineOperatorBuilder* machine() { return machine_; }
   Graph* graph() { return graph_; }
   Zone* zone() { return graph()->zone(); }
   Isolate* isolate() { return zone()->isolate(); }
@@ -87,9 +82,8 @@ class JSGraph : public ZoneObject {
  private:
   Graph* graph_;
   CommonOperatorBuilder* common_;
-  JSOperatorBuilder* javascript_;
+  JSOperatorBuilder javascript_;
   Typer* typer_;
-  MachineOperatorBuilder* machine_;
 
   SetOncePointer<Node> c_entry_stub_constant_;
   SetOncePointer<Node> undefined_constant_;