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

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

 // 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.
 
 #include "src/v8.h"
 
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/typer.h"
 #include "src/types.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/compiler/value-helper.h"
 
 using namespace v8::internal;
 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_;
 };
 
 
 class JSConstantCacheTester : public HandleAndZoneScope,
                               public JSCacheTesterHelper,
                               public JSGraph {
  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; }
 
   Handle<Object> handle(Node* node) {
     CHECK_EQ(IrOpcode::kHeapConstant, node->opcode());
     return OpParameter<Unique<Object> >(node).handle();
   }
 
   Factory* factory() { return main_isolate()->factory(); }
 };
@@ skipping 231 matching lines @@
   CHECK(T.upper(T.NullConstant())->Is(Type::Null()));
   CHECK(T.upper(T.ZeroConstant())->Is(Type::Number()));
   CHECK(T.upper(T.OneConstant())->Is(Type::Number()));
   CHECK(T.upper(T.NaNConstant())->Is(Type::NaN()));
 }
 
 
 TEST(ExternalReferences) {
   // TODO(titzer): test canonicalization of external references.
 }