test/unittests/compiler/change-lowering-unittest.cc - Issue 1513383003: [turbofan] Store nodes use only MachineRepresentation, not MachineType.

Unified Diff: test/unittests/compiler/change-lowering-unittest.cc

Issue 1513383003: [turbofan] Store nodes use only MachineRepresentation, not MachineType. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: please mips64 Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « test/unittests/compiler/arm64/instruction-selector-arm64-unittest.cc ('k') | test/unittests/compiler/ia32/instruction-selector-ia32-unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: test/unittests/compiler/change-lowering-unittest.cc

diff --git a/test/unittests/compiler/change-lowering-unittest.cc b/test/unittests/compiler/change-lowering-unittest.cc

index cd6ac5869ae1159f4e8eda4569ca40fa6e18e5e3..fd0766cabab589c15dc07dbb275ddb81f7dbd9e9 100644

--- a/test/unittests/compiler/change-lowering-unittest.cc

+++ b/test/unittests/compiler/change-lowering-unittest.cc

@@ -192,11 +192,11 @@ TARGET_TEST_P(ChangeLoweringCommonTest, StoreFieldSmi) {

Reduction r = Reduce(store);

ASSERT_TRUE(r.Changed());

- EXPECT_THAT(

- r.replacement(),

- IsStore(StoreRepresentation(MachineType::AnyTagged(), kNoWriteBarrier),

- p0, IsIntPtrConstant(access.offset - access.tag()), p1,

- graph()->start(), graph()->start()));

+ EXPECT_THAT(r.replacement(),

+ IsStore(StoreRepresentation(MachineRepresentation::kTagged,

+ kNoWriteBarrier),

+ p0, IsIntPtrConstant(access.offset - access.tag()), p1,

+ graph()->start(), graph()->start()));

}

@@ -211,11 +211,11 @@ TARGET_TEST_P(ChangeLoweringCommonTest, StoreFieldTagged) {

Reduction r = Reduce(store);

ASSERT_TRUE(r.Changed());

- EXPECT_THAT(

- r.replacement(),

- IsStore(StoreRepresentation(MachineType::AnyTagged(), kFullWriteBarrier),

- p0, IsIntPtrConstant(access.offset - access.tag()), p1,

- graph()->start(), graph()->start()));

+ EXPECT_THAT(r.replacement(),

+ IsStore(StoreRepresentation(MachineRepresentation::kTagged,

+ kFullWriteBarrier),

+ p0, IsIntPtrConstant(access.offset - access.tag()), p1,

+ graph()->start(), graph()->start()));

}

@@ -257,10 +257,10 @@ TARGET_TEST_P(ChangeLoweringCommonTest, StoreElementTagged) {

index_match = IsChangeUint32ToUint64(index_match);

}

- EXPECT_THAT(

- r.replacement(),

- IsStore(StoreRepresentation(MachineType::AnyTagged(), kFullWriteBarrier),

- p0, index_match, p2, graph()->start(), graph()->start()));

+ EXPECT_THAT(r.replacement(),

+ IsStore(StoreRepresentation(MachineRepresentation::kTagged,

+ kFullWriteBarrier),

+ p0, index_match, p2, graph()->start(), graph()->start()));

}

@@ -281,10 +281,10 @@ TARGET_TEST_P(ChangeLoweringCommonTest, StoreElementUint8) {

index_match = IsChangeUint32ToUint64(index_match);

}

- EXPECT_THAT(

- r.replacement(),

- IsStore(StoreRepresentation(MachineType::Uint8(), kNoWriteBarrier), p0,

- index_match, p2, graph()->start(), graph()->start()));

+ EXPECT_THAT(r.replacement(),

+ IsStore(StoreRepresentation(MachineRepresentation::kWord8,

+ kNoWriteBarrier),

+ p0, index_match, p2, graph()->start(), graph()->start()));

}

@@ -371,23 +371,23 @@ TARGET_TEST_F(ChangeLowering32Test, ChangeInt32ToTagged) {

Capture<Node*> add, branch, heap_number, if_true;

EXPECT_THAT(

r.replacement(),

- 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()))))));

+ IsPhi(MachineRepresentation::kTagged,

+ IsFinishRegion(

+ AllOf(CaptureEq(&heap_number),

+ IsAllocateHeapNumber(_, CaptureEq(&if_true))),

+ IsStore(

+ StoreRepresentation(MachineRepresentation::kFloat64,

+ 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()))))));

}

@@ -480,7 +480,8 @@ TARGET_TEST_F(ChangeLowering32Test, ChangeUint32ToTagged) {

AllOf(CaptureEq(&heap_number),

IsAllocateHeapNumber(_, CaptureEq(&if_false))),

IsStore(

- StoreRepresentation(MachineType::Float64(), kNoWriteBarrier),

+ StoreRepresentation(MachineRepresentation::kFloat64,

+ kNoWriteBarrier),

CaptureEq(&heap_number),

IsInt32Constant(HeapNumber::kValueOffset - kHeapObjectTag),

IsChangeUint32ToFloat64(value), CaptureEq(&heap_number),

@@ -608,7 +609,8 @@ TARGET_TEST_F(ChangeLowering64Test, ChangeUint32ToTagged) {

AllOf(CaptureEq(&heap_number),

IsAllocateHeapNumber(_, CaptureEq(&if_false))),

IsStore(

- StoreRepresentation(MachineType::Float64(), kNoWriteBarrier),

+ StoreRepresentation(MachineRepresentation::kFloat64,

+ kNoWriteBarrier),

CaptureEq(&heap_number),

IsInt64Constant(HeapNumber::kValueOffset - kHeapObjectTag),

IsChangeUint32ToFloat64(value), CaptureEq(&heap_number),