[turbofan] Fix the node matchers.

test/cctest/compiler/value-helper.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_CCTEST_COMPILER_VALUE_HELPER_H_
 #define V8_CCTEST_COMPILER_VALUE_HELPER_H_
 
 #include "src/v8.h"
 
 #include "src/compiler/common-operator.h"
 #include "src/compiler/node.h"
 #include "src/compiler/node-matchers.h"
 #include "src/isolate.h"
 #include "src/objects.h"
 #include "test/cctest/cctest.h"
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 // A collection of utilities related to numerical and heap values, including
 // example input values of various types, including int32_t, uint32_t, double,
 // etc.
 class ValueHelper {
  public:
   Isolate* isolate_;
 
   ValueHelper() : isolate_(CcTest::InitIsolateOnce()) {}
 
-  template <typename T>
-  void CheckConstant(T expected, Node* node) {
-    CHECK_EQ(expected, ValueOf<T>(node->op()));
-  }
-
   void CheckFloat64Constant(double expected, Node* node) {
     CHECK_EQ(IrOpcode::kFloat64Constant, node->opcode());
-    CHECK_EQ(expected, ValueOf<double>(node->op()));
+    CHECK_EQ(expected, OpParameter<double>(node));
   }
 
   void CheckNumberConstant(double expected, Node* node) {
     CHECK_EQ(IrOpcode::kNumberConstant, node->opcode());
-    CHECK_EQ(expected, ValueOf<double>(node->op()));
+    CHECK_EQ(expected, OpParameter<double>(node));
   }
 
   void CheckInt32Constant(int32_t expected, Node* node) {
     CHECK_EQ(IrOpcode::kInt32Constant, node->opcode());
-    CHECK_EQ(expected, ValueOf<int32_t>(node->op()));
+    CHECK_EQ(expected, OpParameter<int32_t>(node));
   }
 
   void CheckUint32Constant(int32_t expected, Node* node) {
     CHECK_EQ(IrOpcode::kInt32Constant, node->opcode());
-    CHECK_EQ(expected, ValueOf<uint32_t>(node->op()));
+    CHECK_EQ(expected, OpParameter<uint32_t>(node));
   }
 
   void CheckHeapConstant(Object* expected, Node* node) {
     CHECK_EQ(IrOpcode::kHeapConstant, node->opcode());
-    CHECK_EQ(expected, *ValueOf<Handle<Object> >(node->op()));
+    CHECK_EQ(expected, *OpParameter<Unique<Object> >(node).handle());
   }
 
   void CheckTrue(Node* node) {
     CheckHeapConstant(isolate_->heap()->true_value(), node);
   }
 
   void CheckFalse(Node* node) {
     CheckHeapConstant(isolate_->heap()->false_value(), node);
   }
 
@@ skipping 58 matching lines @@
 
 #define FOR_INT32_SHIFTS(var) for (int32_t var = 0; var < 32; var++)
 
 #define FOR_UINT32_SHIFTS(var) for (uint32_t var = 0; var < 32; var++)
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_CCTEST_COMPILER_VALUE_HELPER_H_