| Index: test/unittests/compiler/control-reducer-unittest.cc
|
| diff --git a/test/unittests/compiler/control-reducer-unittest.cc b/test/unittests/compiler/control-reducer-unittest.cc
|
| index 2f65caadc37b833c888524b30fde1a826e3afcdf..a91f2b761b73cf3b79bcc7448b105618549545fe 100644
|
| --- a/test/unittests/compiler/control-reducer-unittest.cc
|
| +++ b/test/unittests/compiler/control-reducer-unittest.cc
|
| @@ -57,11 +57,10 @@ TEST_F(ControlReducerTest, NonTerminatingLoop) {
|
| Node* loop = graph()->NewNode(common()->Loop(2), graph()->start());
|
| loop->AppendInput(graph()->zone(), loop);
|
| ReduceGraph();
|
| - EXPECT_THAT(
|
| - graph()->end(),
|
| - IsEnd(IsMerge(graph()->start(),
|
| + EXPECT_THAT(graph()->end(),
|
| + IsEnd(graph()->start(),
|
| IsTerminate(graph()->start(),
|
| - AllOf(loop, IsLoop(graph()->start(), loop))))));
|
| + AllOf(loop, IsLoop(graph()->start(), loop)))));
|
| }
|
|
|
|
|
| @@ -74,10 +73,9 @@ TEST_F(ControlReducerTest, NonTerminatingLoopWithEffectPhi) {
|
| ReduceGraph();
|
| EXPECT_THAT(
|
| graph()->end(),
|
| - IsEnd(IsMerge(
|
| - graph()->start(),
|
| - IsTerminate(AllOf(ephi, IsEffectPhi(graph()->start(), ephi, loop)),
|
| - AllOf(loop, IsLoop(graph()->start(), loop))))));
|
| + IsEnd(graph()->start(),
|
| + IsTerminate(AllOf(ephi, IsEffectPhi(graph()->start(), ephi, loop)),
|
| + AllOf(loop, IsLoop(graph()->start(), loop)))));
|
| }
|
|
|
|
|
| @@ -93,13 +91,12 @@ TEST_F(ControlReducerTest, NonTerminatingLoopWithTwoEffectPhis) {
|
| ReduceGraph();
|
| EXPECT_THAT(
|
| graph()->end(),
|
| - IsEnd(IsMerge(
|
| - graph()->start(),
|
| - IsTerminate(
|
| - IsEffectSet(
|
| - AllOf(ephi1, IsEffectPhi(graph()->start(), ephi1, loop)),
|
| - AllOf(ephi2, IsEffectPhi(graph()->start(), ephi2, loop))),
|
| - AllOf(loop, IsLoop(graph()->start(), loop))))));
|
| + IsEnd(graph()->start(),
|
| + IsTerminate(
|
| + IsEffectSet(
|
| + AllOf(ephi1, IsEffectPhi(graph()->start(), ephi1, loop)),
|
| + AllOf(ephi2, IsEffectPhi(graph()->start(), ephi2, loop))),
|
| + AllOf(loop, IsLoop(graph()->start(), loop)))));
|
| }
|
|
|
|
|
| @@ -320,7 +317,6 @@ TEST_F(ControlReducerTest, SelectTwoPhis) {
|
| EXPECT_THAT(graph()->end(), IsEnd(ret));
|
| }
|
|
|
| -
|
| } // namespace compiler
|
| } // namespace internal
|
| } // namespace v8
|
|
|