| Index: test/cctest/compiler/test-control-reducer.cc
|
| diff --git a/test/cctest/compiler/test-control-reducer.cc b/test/cctest/compiler/test-control-reducer.cc
|
| index 67fdb6840b94a840b85256d2e08cdaa1ebb203cc..d0103f5644009aaf28f1b99a198efa54512f7a73 100644
|
| --- a/test/cctest/compiler/test-control-reducer.cc
|
| +++ b/test/cctest/compiler/test-control-reducer.cc
|
| @@ -772,7 +772,7 @@ TEST(CMergeReduce_edit_phi1) {
|
| R.leaf[1], R.leaf[2], merge);
|
| R.ReduceMerge(merge, merge);
|
| CHECK_EQ(IrOpcode::kPhi, phi->opcode());
|
| - CHECK_EQ(2, phi->op()->InputCount());
|
| + CHECK_EQ(2, phi->op()->ValueInputCount());
|
| CHECK_EQ(3, phi->InputCount());
|
| CHECK_EQ(R.leaf[i < 1 ? 1 : 0], phi->InputAt(0));
|
| CHECK_EQ(R.leaf[i < 2 ? 2 : 1], phi->InputAt(1));
|
| @@ -791,7 +791,7 @@ TEST(CMergeReduce_edit_effect_phi1) {
|
| R.leaf[2], merge);
|
| R.ReduceMerge(merge, merge);
|
| CHECK_EQ(IrOpcode::kEffectPhi, phi->opcode());
|
| - CHECK_EQ(0, phi->op()->InputCount());
|
| + CHECK_EQ(0, phi->op()->ValueInputCount());
|
| CHECK_EQ(2, phi->op()->EffectInputCount());
|
| CHECK_EQ(3, phi->InputCount());
|
| CHECK_EQ(R.leaf[i < 1 ? 1 : 0], phi->InputAt(0));
|
| @@ -883,7 +883,7 @@ TEST(CMergeReduce_exhaustive_4) {
|
| selector.CheckNode(ephi, IrOpcode::kEffectPhi, effects, merge);
|
| CHECK_EQ(phi, phi_use->InputAt(0));
|
| CHECK_EQ(ephi, ephi_use->InputAt(0));
|
| - CHECK_EQ(count, phi->op()->InputCount());
|
| + CHECK_EQ(count, phi->op()->ValueInputCount());
|
| CHECK_EQ(count + 1, phi->InputCount());
|
| CHECK_EQ(count, ephi->op()->EffectInputCount());
|
| CHECK_EQ(count + 1, ephi->InputCount());
|
| @@ -909,7 +909,7 @@ TEST(CMergeReduce_edit_many_phis1) {
|
| for (int j = 0; j < kPhiCount; j++) {
|
| Node* phi = phis[j];
|
| CHECK_EQ(IrOpcode::kPhi, phi->opcode());
|
| - CHECK_EQ(2, phi->op()->InputCount());
|
| + CHECK_EQ(2, phi->op()->ValueInputCount());
|
| CHECK_EQ(3, phi->InputCount());
|
| CHECK_EQ(R.leaf[i < 1 ? 1 : 0], phi->InputAt(0));
|
| CHECK_EQ(R.leaf[i < 2 ? 2 : 1], phi->InputAt(1));
|
|
|