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

src/compiler/js-graph.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_JS_GRAPH_H_
 #define V8_COMPILER_JS_GRAPH_H_
 
 #include "src/compiler/common-node-cache.h"
 #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 {
 namespace internal {
 namespace compiler {
 
 class Typer;
 
 // Implements a facade on a Graph, enhancing the graph with JS-specific
 // notions, including a builder for for JS* operators, canonicalized global
 // 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.
   Node* CEntryStubConstant();
   Node* UndefinedConstant();
   Node* TheHoleConstant();
   Node* TrueConstant();
   Node* FalseConstant();
   Node* NullConstant();
   Node* ZeroConstant();
@@ skipping 26 matching lines @@
   Node* Float64Constant(double value);
 
   // Creates an ExternalConstant node, usually canonicalized.
   Node* ExternalConstant(ExternalReference ref);
 
   Node* SmiConstant(int32_t immediate) {
     DCHECK(Smi::IsValid(immediate));
     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(); }
 
  private:
   Graph* graph_;
   CommonOperatorBuilder* common_;
-  JSOperatorBuilder* javascript_;
+  JSOperatorBuilder javascript_;
   Typer* typer_;
-  MachineOperatorBuilder* machine_;
 
   SetOncePointer<Node> c_entry_stub_constant_;
   SetOncePointer<Node> undefined_constant_;
   SetOncePointer<Node> the_hole_constant_;
   SetOncePointer<Node> true_constant_;
   SetOncePointer<Node> false_constant_;
   SetOncePointer<Node> null_constant_;
   SetOncePointer<Node> zero_constant_;
   SetOncePointer<Node> one_constant_;
   SetOncePointer<Node> nan_constant_;
 
   CommonNodeCache cache_;
 
   Node* ImmovableHeapConstant(Handle<Object> value);
   Node* NumberConstant(double value);
   Node* NewNode(Operator* op);
 
   Factory* factory() { return isolate()->factory(); }
 };
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif