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

test/cctest/compiler/test-js-constant-cache.cc

Index: test/cctest/compiler/test-js-constant-cache.cc
diff --git a/test/cctest/compiler/test-js-constant-cache.cc b/test/cctest/compiler/test-js-constant-cache.cc
index 8bfadbfc0d66bad12d394a8c99f1d50e1a6b28de..fc67df27a1745317ac73077ea4655f4e3cab4b91 100644
--- a/test/cctest/compiler/test-js-constant-cache.cc
+++ b/test/cctest/compiler/test-js-constant-cache.cc
@@ -17,16 +17,10 @@ using namespace v8::internal::compiler;
 class JSCacheTesterHelper {
  protected:
   explicit JSCacheTesterHelper(Zone* zone)
-      : main_graph_(zone),
-        main_common_(zone),
-        main_javascript_(zone),
-        main_typer_(zone),
-        main_machine_(zone) {}
+      : main_graph_(zone), main_common_(zone), main_typer_(zone) {}
   Graph main_graph_;
   CommonOperatorBuilder main_common_;
-  JSOperatorBuilder main_javascript_;
   Typer main_typer_;
-  MachineOperatorBuilder main_machine_;
 };
 
 
@@ -36,8 +30,7 @@ class JSConstantCacheTester : public HandleAndZoneScope,
  public:
   JSConstantCacheTester()
       : JSCacheTesterHelper(main_zone()),
-        JSGraph(&main_graph_, &main_common_, &main_javascript_, &main_typer_,
-                &main_machine_) {}
+        JSGraph(&main_graph_, &main_common_, &main_typer_) {}
 
   Type* upper(Node* node) { return NodeProperties::GetBounds(node).upper; }