Unify MachineType and RepType.

test/compiler-unittests/change-lowering-unittest.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/compiler/change-lowering.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/node-properties-inl.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/factory.h"
@@ skipping 119 matching lines @@
   ASSERT_THAT(smi, IsProjection(0, IsInt32AddWithOverflow(val, val)));
 
   Node* heap_number = NodeProperties::GetValueInput(phi, 0);
   ASSERT_EQ(IrOpcode::kCall, heap_number->opcode());
 
   Node* merge = NodeProperties::GetControlInput(phi);
   ASSERT_EQ(IrOpcode::kMerge, merge->opcode());
 
   const int32_t kValueOffset = HeapNumber::kValueOffset - kHeapObjectTag;
   EXPECT_THAT(NodeProperties::GetControlInput(merge, 0),
-              IsStore(kMachineFloat64, kNoWriteBarrier, heap_number,
+              IsStore(mFloat64, kNoWriteBarrier, heap_number,
                       IsInt32Constant(kValueOffset),
                       IsChangeInt32ToFloat64(val), _, heap_number));
 
   Node* if_true = NodeProperties::GetControlInput(heap_number);
   ASSERT_EQ(IrOpcode::kIfTrue, if_true->opcode());
 
   Node* if_false = NodeProperties::GetControlInput(merge, 1);
   ASSERT_EQ(IrOpcode::kIfFalse, if_false->opcode());
 
   Node* branch = NodeProperties::GetControlInput(if_true);
   EXPECT_EQ(branch, NodeProperties::GetControlInput(if_false));
   EXPECT_THAT(branch,
               IsBranch(IsProjection(1, IsInt32AddWithOverflow(val, val)),
                        graph()->start()));
 }
 
 
 TARGET_TEST_F(ChangeLowering32Test, ChangeTaggedToFloat64) {
   Node* val = Parameter(0);
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToFloat64(), val);
   Reduction reduction = Reduce(node);
   ASSERT_TRUE(reduction.Changed());
 
   const int32_t kShiftAmount =
       kSmiTagSize + SmiTagging<kPointerSize>::kSmiShiftSize;
   const int32_t kValueOffset = HeapNumber::kValueOffset - kHeapObjectTag;
   Node* phi = reduction.replacement();
-  ASSERT_THAT(
-      phi, IsPhi(IsLoad(kMachineFloat64, val, IsInt32Constant(kValueOffset), _),
-                 IsChangeInt32ToFloat64(
-                     IsWord32Sar(val, IsInt32Constant(kShiftAmount))),
-                 _));
+  ASSERT_THAT(phi,
+              IsPhi(IsLoad(mFloat64, val, IsInt32Constant(kValueOffset), _),
+                    IsChangeInt32ToFloat64(
+                        IsWord32Sar(val, IsInt32Constant(kShiftAmount))),
+                    _));
 
   Node* merge = NodeProperties::GetControlInput(phi);
   ASSERT_EQ(IrOpcode::kMerge, merge->opcode());
 
   Node* if_true = NodeProperties::GetControlInput(merge, 0);
   ASSERT_EQ(IrOpcode::kIfTrue, if_true->opcode());
 
   Node* if_false = NodeProperties::GetControlInput(merge, 1);
   ASSERT_EQ(IrOpcode::kIfFalse, if_false->opcode());
 
@@ skipping 39 matching lines @@
 TARGET_TEST_F(ChangeLowering64Test, ChangeTaggedToFloat64) {
   Node* val = Parameter(0);
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToFloat64(), val);
   Reduction reduction = Reduce(node);
   ASSERT_TRUE(reduction.Changed());
 
   const int32_t kShiftAmount =
       kSmiTagSize + SmiTagging<kPointerSize>::kSmiShiftSize;
   const int32_t kValueOffset = HeapNumber::kValueOffset - kHeapObjectTag;
   Node* phi = reduction.replacement();
-  ASSERT_THAT(
-      phi, IsPhi(IsLoad(kMachineFloat64, val, IsInt32Constant(kValueOffset), _),
-                 IsChangeInt32ToFloat64(IsConvertInt64ToInt32(
-                     IsWord64Sar(val, IsInt32Constant(kShiftAmount)))),
-                 _));
+  ASSERT_THAT(phi,
+              IsPhi(IsLoad(mFloat64, val, IsInt32Constant(kValueOffset), _),
+                    IsChangeInt32ToFloat64(IsConvertInt64ToInt32(
+                        IsWord64Sar(val, IsInt32Constant(kShiftAmount)))),
+                    _));
 
   Node* merge = NodeProperties::GetControlInput(phi);
   ASSERT_EQ(IrOpcode::kMerge, merge->opcode());
 
   Node* if_true = NodeProperties::GetControlInput(merge, 0);
   ASSERT_EQ(IrOpcode::kIfTrue, if_true->opcode());
 
   Node* if_false = NodeProperties::GetControlInput(merge, 1);
   ASSERT_EQ(IrOpcode::kIfFalse, if_false->opcode());
 
   Node* branch = NodeProperties::GetControlInput(if_true);
   EXPECT_EQ(branch, NodeProperties::GetControlInput(if_false));
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
   EXPECT_THAT(branch, IsBranch(IsWord64And(val, IsInt32Constant(kSmiTagMask)),
                                graph()->start()));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8