[turbofan] Make MachineType a pair of enums.

test/unittests/compiler/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/code-stubs.h"
 #include "src/compiler/change-lowering.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
 #include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"
 
 using testing::_;
 using testing::AllOf;
 using testing::BitEq;
 using testing::Capture;
 using testing::CaptureEq;
 
 namespace v8 {
 namespace internal {
 namespace compiler {
 
 class ChangeLoweringTest : public TypedGraphTest {
  public:
   ChangeLoweringTest() : simplified_(zone()) {}
 
-  virtual MachineType WordRepresentation() const = 0;
+  virtual MachineRepresentation WordRepresentation() const = 0;
 
  protected:
-  bool Is32() const { return WordRepresentation() == kRepWord32; }
-  bool Is64() const { return WordRepresentation() == kRepWord64; }
+  bool Is32() const {
+    return WordRepresentation() == MachineRepresentation::kWord32;
+  }
+  bool Is64() const {
+    return WordRepresentation() == MachineRepresentation::kWord64;
+  }
 
   Reduction Reduce(Node* node) {
     MachineOperatorBuilder machine(zone(), WordRepresentation());
     JSOperatorBuilder javascript(zone());
     JSGraph jsgraph(isolate(), graph(), common(), &javascript, nullptr,
                     &machine);
     ChangeLowering reducer(&jsgraph);
     return reducer.Reduce(node);
   }
 
@@ skipping 15 matching lines @@
                         IsWord64Sar(value_matcher, IsSmiShiftBitsConstant()))
                   : IsWord32Sar(value_matcher, IsSmiShiftBitsConstant());
   }
   Matcher<Node*> IsChangeUint32ToSmi(const Matcher<Node*>& value_matcher) {
     return Is64() ? IsWord64Shl(IsChangeUint32ToUint64(value_matcher),
                                 IsSmiShiftBitsConstant())
                   : IsWord32Shl(value_matcher, IsSmiShiftBitsConstant());
   }
   Matcher<Node*> IsLoadHeapNumber(const Matcher<Node*>& value_matcher,
                                   const Matcher<Node*>& control_matcher) {
-    return IsLoad(kMachFloat64, value_matcher,
+    return IsLoad(MachineType::Float64(), value_matcher,
                   IsIntPtrConstant(HeapNumber::kValueOffset - kHeapObjectTag),
                   graph()->start(), control_matcher);
   }
   Matcher<Node*> IsIntPtrConstant(int value) {
     return Is32() ? IsInt32Constant(value) : IsInt64Constant(value);
   }
   Matcher<Node*> IsSmiShiftBitsConstant() {
     return IsIntPtrConstant(kSmiShiftSize + kSmiTagSize);
   }
   Matcher<Node*> IsWordEqual(const Matcher<Node*>& lhs_matcher,
                              const Matcher<Node*>& rhs_matcher) {
     return Is32() ? IsWord32Equal(lhs_matcher, rhs_matcher)
                   : IsWord64Equal(lhs_matcher, rhs_matcher);
   }
 
  private:
   SimplifiedOperatorBuilder simplified_;
 };
 
 
 // -----------------------------------------------------------------------------
 // Common.
 
 
 class ChangeLoweringCommonTest
     : public ChangeLoweringTest,
-      public ::testing::WithParamInterface<MachineType> {
+      public ::testing::WithParamInterface<MachineRepresentation> {
  public:
   ~ChangeLoweringCommonTest() override {}
 
-  MachineType WordRepresentation() const final { return GetParam(); }
+  MachineRepresentation WordRepresentation() const final { return GetParam(); }
 };
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, ChangeBitToBool) {
   Node* value = Parameter(Type::Boolean());
   Reduction r =
       Reduce(graph()->NewNode(simplified()->ChangeBitToBool(), value));
   ASSERT_TRUE(r.Changed());
-  EXPECT_THAT(r.replacement(), IsSelect(kMachAnyTagged, value, IsTrueConstant(),
-                                        IsFalseConstant()));
+  EXPECT_THAT(r.replacement(), IsSelect(MachineRepresentation::kTagged, value,
+                                        IsTrueConstant(), IsFalseConstant()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, ChangeBoolToBit) {
   Node* value = Parameter(Type::Number());
   Reduction r =
       Reduce(graph()->NewNode(simplified()->ChangeBoolToBit(), value));
   ASSERT_TRUE(r.Changed());
   EXPECT_THAT(r.replacement(), IsWordEqual(value, IsTrueConstant()));
 }
@@ skipping 50 matching lines @@
   Reduction r =
       Reduce(graph()->NewNode(simplified()->ChangeTaggedToUint32(), value));
   ASSERT_TRUE(r.Changed());
   EXPECT_THAT(r.replacement(), IsChangeFloat64ToUint32(
                                    IsLoadHeapNumber(value, graph()->start())));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, StoreFieldSmi) {
   FieldAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize,
-                        Handle<Name>::null(), Type::Any(), kMachAnyTagged};
+                        Handle<Name>::null(), Type::Any(),
+                        MachineType::AnyTagged()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* p1 = Parameter(Type::TaggedSigned());
   Node* store = graph()->NewNode(simplified()->StoreField(access), p0, p1,
                                  graph()->start(), graph()->start());
   Reduction r = Reduce(store);
 
   ASSERT_TRUE(r.Changed());
-  EXPECT_THAT(r.replacement(),
-              IsStore(StoreRepresentation(kMachAnyTagged, kNoWriteBarrier), p0,
-                      IsIntPtrConstant(access.offset - access.tag()), p1,
-                      graph()->start(), graph()->start()));
+  EXPECT_THAT(
+      r.replacement(),
+      IsStore(StoreRepresentation(MachineType::AnyTagged(), kNoWriteBarrier),
+              p0, IsIntPtrConstant(access.offset - access.tag()), p1,
+              graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, StoreFieldTagged) {
   FieldAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize,
-                        Handle<Name>::null(), Type::Any(), kMachAnyTagged};
+                        Handle<Name>::null(), Type::Any(),
+                        MachineType::AnyTagged()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* p1 = Parameter(Type::Tagged());
   Node* store = graph()->NewNode(simplified()->StoreField(access), p0, p1,
                                  graph()->start(), graph()->start());
   Reduction r = Reduce(store);
 
   ASSERT_TRUE(r.Changed());
-  EXPECT_THAT(r.replacement(),
-              IsStore(StoreRepresentation(kMachAnyTagged, kFullWriteBarrier),
-                      p0, IsIntPtrConstant(access.offset - access.tag()), p1,
-                      graph()->start(), graph()->start()));
+  EXPECT_THAT(
+      r.replacement(),
+      IsStore(StoreRepresentation(MachineType::AnyTagged(), kFullWriteBarrier),
+              p0, IsIntPtrConstant(access.offset - access.tag()), p1,
+              graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, LoadField) {
   FieldAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize,
-                        Handle<Name>::null(), Type::Any(), kMachAnyTagged};
+                        Handle<Name>::null(), Type::Any(),
+                        MachineType::AnyTagged()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* load = graph()->NewNode(simplified()->LoadField(access), p0,
                                 graph()->start(), graph()->start());
   Reduction r = Reduce(load);
 
   ASSERT_TRUE(r.Changed());
   Matcher<Node*> index_match = IsIntPtrConstant(access.offset - access.tag());
-  EXPECT_THAT(
-      r.replacement(),
-      IsLoad(kMachAnyTagged, p0, IsIntPtrConstant(access.offset - access.tag()),
-             graph()->start(), graph()->start()));
+  EXPECT_THAT(r.replacement(),
+              IsLoad(MachineType::AnyTagged(), p0,
+                     IsIntPtrConstant(access.offset - access.tag()),
+                     graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, StoreElementTagged) {
   ElementAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize, Type::Any(),
-                          kMachAnyTagged};
+                          MachineType::AnyTagged()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* p1 = Parameter(Type::Signed32());
   Node* p2 = Parameter(Type::Tagged());
   Node* store = graph()->NewNode(simplified()->StoreElement(access), p0, p1, p2,
                                  graph()->start(), graph()->start());
   Reduction r = Reduce(store);
 
-  const int element_size_shift = ElementSizeLog2Of(access.machine_type);
+  const int element_size_shift =
+      ElementSizeLog2Of(access.machine_type.representation());
   ASSERT_TRUE(r.Changed());
   Matcher<Node*> index_match =
       IsInt32Add(IsWord32Shl(p1, IsInt32Constant(element_size_shift)),
                  IsInt32Constant(access.header_size - access.tag()));
   if (!Is32()) {
     index_match = IsChangeUint32ToUint64(index_match);
   }
 
-  EXPECT_THAT(r.replacement(),
-              IsStore(StoreRepresentation(kMachAnyTagged, kFullWriteBarrier),
-                      p0, index_match, p2, graph()->start(), graph()->start()));
+  EXPECT_THAT(
+      r.replacement(),
+      IsStore(StoreRepresentation(MachineType::AnyTagged(), kFullWriteBarrier),
+              p0, index_match, p2, graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, StoreElementUint8) {
   ElementAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize,
-                          Type::Signed32(), kMachUint8};
+                          Type::Signed32(), MachineType::Uint8()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* p1 = Parameter(Type::Signed32());
   Node* p2 = Parameter(Type::Signed32());
   Node* store = graph()->NewNode(simplified()->StoreElement(access), p0, p1, p2,
                                  graph()->start(), graph()->start());
   Reduction r = Reduce(store);
 
   ASSERT_TRUE(r.Changed());
   Matcher<Node*> index_match =
       IsInt32Add(p1, IsInt32Constant(access.header_size - access.tag()));
   if (!Is32()) {
     index_match = IsChangeUint32ToUint64(index_match);
   }
 
-  EXPECT_THAT(r.replacement(),
-              IsStore(StoreRepresentation(kMachUint8, kNoWriteBarrier), p0,
-                      index_match, p2, graph()->start(), graph()->start()));
+  EXPECT_THAT(
+      r.replacement(),
+      IsStore(StoreRepresentation(MachineType::Uint8(), kNoWriteBarrier), p0,
+              index_match, p2, graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, LoadElementTagged) {
   ElementAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize, Type::Any(),
-                          kMachAnyTagged};
+                          MachineType::AnyTagged()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* p1 = Parameter(Type::Signed32());
   Node* load = graph()->NewNode(simplified()->LoadElement(access), p0, p1,
                                 graph()->start(), graph()->start());
   Reduction r = Reduce(load);
 
-  const int element_size_shift = ElementSizeLog2Of(access.machine_type);
+  const int element_size_shift =
+      ElementSizeLog2Of(access.machine_type.representation());
   ASSERT_TRUE(r.Changed());
   Matcher<Node*> index_match =
       IsInt32Add(IsWord32Shl(p1, IsInt32Constant(element_size_shift)),
                  IsInt32Constant(access.header_size - access.tag()));
   if (!Is32()) {
     index_match = IsChangeUint32ToUint64(index_match);
   }
 
-  EXPECT_THAT(r.replacement(), IsLoad(kMachAnyTagged, p0, index_match,
+  EXPECT_THAT(r.replacement(), IsLoad(MachineType::AnyTagged(), p0, index_match,
                                       graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, LoadElementInt8) {
   ElementAccess access = {kTaggedBase, FixedArrayBase::kHeaderSize,
-                          Type::Signed32(), kMachInt8};
+                          Type::Signed32(), MachineType::Int8()};
   Node* p0 = Parameter(Type::TaggedPointer());
   Node* p1 = Parameter(Type::Signed32());
   Node* load = graph()->NewNode(simplified()->LoadElement(access), p0, p1,
                                 graph()->start(), graph()->start());
   Reduction r = Reduce(load);
 
   ASSERT_TRUE(r.Changed());
   Matcher<Node*> index_match =
       IsInt32Add(p1, IsInt32Constant(access.header_size - access.tag()));
   if (!Is32()) {
     index_match = IsChangeUint32ToUint64(index_match);
   }
 
-  EXPECT_THAT(r.replacement(), IsLoad(kMachInt8, p0, index_match,
+  EXPECT_THAT(r.replacement(), IsLoad(MachineType::Int8(), p0, index_match,
                                       graph()->start(), graph()->start()));
 }
 
 
 TARGET_TEST_P(ChangeLoweringCommonTest, Allocate) {
   Node* p0 = Parameter(Type::Signed32());
   Node* alloc = graph()->NewNode(simplified()->Allocate(TENURED), p0,
                                  graph()->start(), graph()->start());
   Reduction r = Reduce(alloc);
 
   // Only check that we lowered, but do not specify the exact form since
   // this is subject to change.
   ASSERT_TRUE(r.Changed());
 }
 
 
 INSTANTIATE_TEST_CASE_P(ChangeLoweringTest, ChangeLoweringCommonTest,
-                        ::testing::Values(kRepWord32, kRepWord64));
+                        ::testing::Values(MachineRepresentation::kWord32,
+                                          MachineRepresentation::kWord64));
 
 
 // -----------------------------------------------------------------------------
 // 32-bit
 
 
 class ChangeLowering32Test : public ChangeLoweringTest {
  public:
   ~ChangeLowering32Test() override {}
-  MachineType WordRepresentation() const final { return kRepWord32; }
+  MachineRepresentation WordRepresentation() const final {
+    return MachineRepresentation::kWord32;
+  }
 };
 
 
 TARGET_TEST_F(ChangeLowering32Test, ChangeInt32ToTagged) {
   Node* value = Parameter(Type::Integral32());
   Node* node = graph()->NewNode(simplified()->ChangeInt32ToTagged(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> add, branch, heap_number, if_true;
   EXPECT_THAT(
       r.replacement(),
-      IsPhi(kMachAnyTagged,
-            IsFinishRegion(
-                AllOf(CaptureEq(&heap_number),
-                      IsAllocateHeapNumber(_, CaptureEq(&if_true))),
-                IsStore(
-                    StoreRepresentation(kMachFloat64, kNoWriteBarrier),
-                    CaptureEq(&heap_number),
-                    IsIntPtrConstant(HeapNumber::kValueOffset - kHeapObjectTag),
-                    IsChangeInt32ToFloat64(value), CaptureEq(&heap_number),
-                    CaptureEq(&if_true))),
-            IsProjection(0, AllOf(CaptureEq(&add),
-                                  IsInt32AddWithOverflow(value, value))),
-            IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
-                    IsIfFalse(AllOf(CaptureEq(&branch),
-                                    IsBranch(IsProjection(1, CaptureEq(&add)),
-                                             graph()->start()))))));
+      IsPhi(
+          MachineRepresentation::kTagged,
+          IsFinishRegion(
+              AllOf(CaptureEq(&heap_number),
+                    IsAllocateHeapNumber(_, CaptureEq(&if_true))),
+              IsStore(
+                  StoreRepresentation(MachineType::Float64(), kNoWriteBarrier),
+                  CaptureEq(&heap_number),
+                  IsIntPtrConstant(HeapNumber::kValueOffset - kHeapObjectTag),
+                  IsChangeInt32ToFloat64(value), CaptureEq(&heap_number),
+                  CaptureEq(&if_true))),
+          IsProjection(
+              0, AllOf(CaptureEq(&add), IsInt32AddWithOverflow(value, value))),
+          IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
+                  IsIfFalse(AllOf(CaptureEq(&branch),
+                                  IsBranch(IsProjection(1, CaptureEq(&add)),
+                                           graph()->start()))))));
 }
 
 
 TARGET_TEST_F(ChangeLowering32Test, ChangeTaggedToFloat64) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Number());
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToFloat64(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, if_true;
   EXPECT_THAT(
       r.replacement(),
-      IsPhi(kMachFloat64, IsLoadHeapNumber(value, CaptureEq(&if_true)),
+      IsPhi(MachineRepresentation::kFloat64,
+            IsLoadHeapNumber(value, CaptureEq(&if_true)),
             IsChangeInt32ToFloat64(IsWord32Sar(
                 value, IsInt32Constant(kSmiTagSize + kSmiShiftSize))),
             IsMerge(AllOf(CaptureEq(&if_true),
                           IsIfTrue(AllOf(
                               CaptureEq(&branch),
                               IsBranch(IsWord32And(
                                            value, IsInt32Constant(kSmiTagMask)),
                                        graph()->start())))),
                     IsIfFalse(CaptureEq(&branch)))));
 }
 
 
 TARGET_TEST_F(ChangeLowering32Test, ChangeTaggedToInt32) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Signed32());
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToInt32(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, if_true;
   EXPECT_THAT(
       r.replacement(),
       IsPhi(
-          kMachInt32,
+          MachineRepresentation::kWord32,
           IsChangeFloat64ToInt32(IsLoadHeapNumber(value, CaptureEq(&if_true))),
           IsWord32Sar(value, IsInt32Constant(kSmiTagSize + kSmiShiftSize)),
           IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
                   IsIfFalse(AllOf(
                       CaptureEq(&branch),
                       IsBranch(IsWord32And(value, IsInt32Constant(kSmiTagMask)),
                                graph()->start()))))));
 }
 
 
 TARGET_TEST_F(ChangeLowering32Test, ChangeTaggedToUint32) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Unsigned32());
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToUint32(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, if_true;
   EXPECT_THAT(
       r.replacement(),
       IsPhi(
-          kMachUint32,
+          MachineRepresentation::kWord32,
           IsChangeFloat64ToUint32(IsLoadHeapNumber(value, CaptureEq(&if_true))),
           IsWord32Sar(value, IsInt32Constant(kSmiTagSize + kSmiShiftSize)),
           IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
                   IsIfFalse(AllOf(
                       CaptureEq(&branch),
                       IsBranch(IsWord32And(value, IsInt32Constant(kSmiTagMask)),
                                graph()->start()))))));
 }
 
 
 TARGET_TEST_F(ChangeLowering32Test, ChangeUint32ToTagged) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Number());
   Node* node = graph()->NewNode(simplified()->ChangeUint32ToTagged(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, heap_number, if_false;
   EXPECT_THAT(
       r.replacement(),
       IsPhi(
-          kMachAnyTagged,
+          MachineRepresentation::kTagged,
           IsWord32Shl(value, IsInt32Constant(kSmiTagSize + kSmiShiftSize)),
           IsFinishRegion(
               AllOf(CaptureEq(&heap_number),
                     IsAllocateHeapNumber(_, CaptureEq(&if_false))),
               IsStore(
-                  StoreRepresentation(kMachFloat64, kNoWriteBarrier),
+                  StoreRepresentation(MachineType::Float64(), kNoWriteBarrier),
                   CaptureEq(&heap_number),
                   IsInt32Constant(HeapNumber::kValueOffset - kHeapObjectTag),
                   IsChangeUint32ToFloat64(value), CaptureEq(&heap_number),
                   CaptureEq(&if_false))),
           IsMerge(IsIfTrue(AllOf(
                       CaptureEq(&branch),
                       IsBranch(IsUint32LessThanOrEqual(
                                    value, IsInt32Constant(Smi::kMaxValue)),
                                graph()->start()))),
                   AllOf(CaptureEq(&if_false), IsIfFalse(CaptureEq(&branch))))));
 }
 
 
 // -----------------------------------------------------------------------------
 // 64-bit
 
 
 class ChangeLowering64Test : public ChangeLoweringTest {
  public:
   ~ChangeLowering64Test() override {}
-  MachineType WordRepresentation() const final { return kRepWord64; }
+  MachineRepresentation WordRepresentation() const final {
+    return MachineRepresentation::kWord64;
+  }
 };
 
 
 TARGET_TEST_F(ChangeLowering64Test, ChangeInt32ToTagged) {
   Node* value = Parameter(Type::Signed32());
   Node* node = graph()->NewNode(simplified()->ChangeInt32ToTagged(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   EXPECT_THAT(r.replacement(), IsChangeInt32ToSmi(value));
 }
 
 
 TARGET_TEST_F(ChangeLowering64Test, ChangeTaggedToFloat64) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Number());
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToFloat64(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, if_true;
   EXPECT_THAT(
       r.replacement(),
-      IsPhi(kMachFloat64, IsLoadHeapNumber(value, CaptureEq(&if_true)),
+      IsPhi(MachineRepresentation::kFloat64,
+            IsLoadHeapNumber(value, CaptureEq(&if_true)),
             IsChangeInt32ToFloat64(IsTruncateInt64ToInt32(IsWord64Sar(
                 value, IsInt64Constant(kSmiTagSize + kSmiShiftSize)))),
             IsMerge(AllOf(CaptureEq(&if_true),
                           IsIfTrue(AllOf(
                               CaptureEq(&branch),
                               IsBranch(IsWord64And(
                                            value, IsInt64Constant(kSmiTagMask)),
                                        graph()->start())))),
                     IsIfFalse(CaptureEq(&branch)))));
 }
 
 
 TARGET_TEST_F(ChangeLowering64Test, ChangeTaggedToInt32) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Signed32());
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToInt32(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, if_true;
   EXPECT_THAT(
       r.replacement(),
       IsPhi(
-          kMachInt32,
+          MachineRepresentation::kWord32,
           IsChangeFloat64ToInt32(IsLoadHeapNumber(value, CaptureEq(&if_true))),
           IsTruncateInt64ToInt32(
               IsWord64Sar(value, IsInt64Constant(kSmiTagSize + kSmiShiftSize))),
           IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
                   IsIfFalse(AllOf(
                       CaptureEq(&branch),
                       IsBranch(IsWord64And(value, IsInt64Constant(kSmiTagMask)),
                                graph()->start()))))));
 }
 
 
 TARGET_TEST_F(ChangeLowering64Test, ChangeTaggedToUint32) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Unsigned32());
   Node* node = graph()->NewNode(simplified()->ChangeTaggedToUint32(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, if_true;
   EXPECT_THAT(
       r.replacement(),
       IsPhi(
-          kMachUint32,
+          MachineRepresentation::kWord32,
           IsChangeFloat64ToUint32(IsLoadHeapNumber(value, CaptureEq(&if_true))),
           IsTruncateInt64ToInt32(
               IsWord64Sar(value, IsInt64Constant(kSmiTagSize + kSmiShiftSize))),
           IsMerge(AllOf(CaptureEq(&if_true), IsIfTrue(CaptureEq(&branch))),
                   IsIfFalse(AllOf(
                       CaptureEq(&branch),
                       IsBranch(IsWord64And(value, IsInt64Constant(kSmiTagMask)),
                                graph()->start()))))));
 }
 
 
 TARGET_TEST_F(ChangeLowering64Test, ChangeUint32ToTagged) {
   STATIC_ASSERT(kSmiTag == 0);
   STATIC_ASSERT(kSmiTagSize == 1);
 
   Node* value = Parameter(Type::Number());
   Node* node = graph()->NewNode(simplified()->ChangeUint32ToTagged(), value);
   Reduction r = Reduce(node);
   ASSERT_TRUE(r.Changed());
   Capture<Node*> branch, heap_number, if_false;
   EXPECT_THAT(
       r.replacement(),
       IsPhi(
-          kMachAnyTagged,
+          MachineRepresentation::kTagged,
           IsWord64Shl(IsChangeUint32ToUint64(value),
                       IsInt64Constant(kSmiTagSize + kSmiShiftSize)),
           IsFinishRegion(
               AllOf(CaptureEq(&heap_number),
                     IsAllocateHeapNumber(_, CaptureEq(&if_false))),
               IsStore(
-                  StoreRepresentation(kMachFloat64, kNoWriteBarrier),
+                  StoreRepresentation(MachineType::Float64(), kNoWriteBarrier),
                   CaptureEq(&heap_number),
                   IsInt64Constant(HeapNumber::kValueOffset - kHeapObjectTag),
                   IsChangeUint32ToFloat64(value), CaptureEq(&heap_number),
                   CaptureEq(&if_false))),
           IsMerge(IsIfTrue(AllOf(
                       CaptureEq(&branch),
                       IsBranch(IsUint32LessThanOrEqual(
                                    value, IsInt32Constant(Smi::kMaxValue)),
                                graph()->start()))),
                   AllOf(CaptureEq(&if_false), IsIfFalse(CaptureEq(&branch))))));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8