[turbofan] Make MachineType a pair of enums.

test/unittests/compiler/simplified-operator-unittest.cc

Index: test/unittests/compiler/simplified-operator-unittest.cc
diff --git a/test/unittests/compiler/simplified-operator-unittest.cc b/test/unittests/compiler/simplified-operator-unittest.cc
index b09840710a831c92c6fc3464dcc947ae12684a80..871189ad79fc55b8d0cdf3803ac2fe9fc620c51f 100644
--- a/test/unittests/compiler/simplified-operator-unittest.cc
+++ b/test/unittests/compiler/simplified-operator-unittest.cc
@@ -200,37 +200,40 @@ INSTANTIATE_TEST_CASE_P(SimplifiedOperatorTest,
 namespace {
 
 const ElementAccess kElementAccesses[] = {
-    {kTaggedBase, FixedArray::kHeaderSize, Type::Any(), kMachAnyTagged},
-    {kUntaggedBase, 0, Type::Any(), kMachInt8},
-    {kUntaggedBase, 0, Type::Any(), kMachInt16},
-    {kUntaggedBase, 0, Type::Any(), kMachInt32},
-    {kUntaggedBase, 0, Type::Any(), kMachUint8},
-    {kUntaggedBase, 0, Type::Any(), kMachUint16},
-    {kUntaggedBase, 0, Type::Any(), kMachUint32},
-    {kUntaggedBase, 0, Type::Signed32(), kMachInt8},
-    {kUntaggedBase, 0, Type::Unsigned32(), kMachUint8},
-    {kUntaggedBase, 0, Type::Signed32(), kMachInt16},
-    {kUntaggedBase, 0, Type::Unsigned32(), kMachUint16},
-    {kUntaggedBase, 0, Type::Signed32(), kMachInt32},
-    {kUntaggedBase, 0, Type::Unsigned32(), kMachUint32},
-    {kUntaggedBase, 0, Type::Number(), kRepFloat32},
-    {kUntaggedBase, 0, Type::Number(), kRepFloat64},
+    {kTaggedBase, FixedArray::kHeaderSize, Type::Any(),
+     MachineType::AnyTagged()},
+    {kUntaggedBase, 0, Type::Any(), MachineType::Int8()},
+    {kUntaggedBase, 0, Type::Any(), MachineType::Int16()},
+    {kUntaggedBase, 0, Type::Any(), MachineType::Int32()},
+    {kUntaggedBase, 0, Type::Any(), MachineType::Uint8()},
+    {kUntaggedBase, 0, Type::Any(), MachineType::Uint16()},
+    {kUntaggedBase, 0, Type::Any(), MachineType::Uint32()},
+    {kUntaggedBase, 0, Type::Signed32(), MachineType::Int8()},
+    {kUntaggedBase, 0, Type::Unsigned32(), MachineType::Uint8()},
+    {kUntaggedBase, 0, Type::Signed32(), MachineType::Int16()},
+    {kUntaggedBase, 0, Type::Unsigned32(), MachineType::Uint16()},
+    {kUntaggedBase, 0, Type::Signed32(), MachineType::Int32()},
+    {kUntaggedBase, 0, Type::Unsigned32(), MachineType::Uint32()},
+    {kUntaggedBase, 0, Type::Number(),
+     MachineType(MachineRepresentation::kFloat32, MachineSemantic::kNone)},
+    {kUntaggedBase, 0, Type::Number(),
+     MachineType(MachineRepresentation::kFloat64, MachineSemantic::kNone)},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Signed32(),
-     kMachInt8},
+     MachineType::Int8()},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Unsigned32(),
-     kMachUint8},
+     MachineType::Uint8()},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Signed32(),
-     kMachInt16},
+     MachineType::Int16()},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Unsigned32(),
-     kMachUint16},
+     MachineType::Uint16()},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Signed32(),
-     kMachInt32},
+     MachineType::Int32()},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Unsigned32(),
-     kMachUint32},
+     MachineType::Uint32()},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Number(),
-     kRepFloat32},
+     MachineType(MachineRepresentation::kFloat32, MachineSemantic::kNone)},
     {kTaggedBase, FixedTypedArrayBase::kDataOffset, Type::Number(),
-     kRepFloat64}};
+     MachineType(MachineRepresentation::kFloat32, MachineSemantic::kNone)}};
 
 }  // namespace