| 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 dcabc1ac74cbd214603058469a539ca89cf60c3b..031a8974f86b68f8501822b4df1bf968fe6400d9 100644
|
| --- a/test/unittests/compiler/simplified-operator-unittest.cc
|
| +++ b/test/unittests/compiler/simplified-operator-unittest.cc
|
| @@ -83,14 +83,14 @@ TEST_P(SimplifiedPureOperatorTest, NumberOfInputsAndOutputs) {
|
| const PureOperator& pop = GetParam();
|
| const Operator* op = (simplified.*pop.constructor)();
|
|
|
| - EXPECT_EQ(pop.value_input_count, OperatorProperties::GetValueInputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetEffectInputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetControlInputCount(op));
|
| + EXPECT_EQ(pop.value_input_count, op->ValueInputCount());
|
| + EXPECT_EQ(0, op->EffectInputCount());
|
| + EXPECT_EQ(0, op->ControlInputCount());
|
| EXPECT_EQ(pop.value_input_count, OperatorProperties::GetTotalInputCount(op));
|
|
|
| - EXPECT_EQ(1, OperatorProperties::GetValueOutputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetEffectOutputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetControlOutputCount(op));
|
| + EXPECT_EQ(1, op->ValueOutputCount());
|
| + EXPECT_EQ(0, op->EffectOutputCount());
|
| + EXPECT_EQ(0, op->ControlOutputCount());
|
| }
|
|
|
|
|
| @@ -175,14 +175,14 @@ TEST_P(SimplifiedElementAccessOperatorTest, LoadElement) {
|
| EXPECT_EQ(Operator::kNoThrow | Operator::kNoWrite, op->properties());
|
| EXPECT_EQ(access, ElementAccessOf(op));
|
|
|
| - EXPECT_EQ(3, OperatorProperties::GetValueInputCount(op));
|
| - EXPECT_EQ(1, OperatorProperties::GetEffectInputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetControlInputCount(op));
|
| + EXPECT_EQ(3, op->ValueInputCount());
|
| + EXPECT_EQ(1, op->EffectInputCount());
|
| + EXPECT_EQ(0, op->ControlInputCount());
|
| EXPECT_EQ(4, OperatorProperties::GetTotalInputCount(op));
|
|
|
| - EXPECT_EQ(1, OperatorProperties::GetValueOutputCount(op));
|
| - EXPECT_EQ(1, OperatorProperties::GetEffectOutputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetControlOutputCount(op));
|
| + EXPECT_EQ(1, op->ValueOutputCount());
|
| + EXPECT_EQ(1, op->EffectOutputCount());
|
| + EXPECT_EQ(0, op->ControlOutputCount());
|
| }
|
|
|
|
|
| @@ -195,14 +195,14 @@ TEST_P(SimplifiedElementAccessOperatorTest, StoreElement) {
|
| EXPECT_EQ(Operator::kNoRead | Operator::kNoThrow, op->properties());
|
| EXPECT_EQ(access, ElementAccessOf(op));
|
|
|
| - EXPECT_EQ(4, OperatorProperties::GetValueInputCount(op));
|
| - EXPECT_EQ(1, OperatorProperties::GetEffectInputCount(op));
|
| - EXPECT_EQ(1, OperatorProperties::GetControlInputCount(op));
|
| + EXPECT_EQ(4, op->ValueInputCount());
|
| + EXPECT_EQ(1, op->EffectInputCount());
|
| + EXPECT_EQ(1, op->ControlInputCount());
|
| EXPECT_EQ(6, OperatorProperties::GetTotalInputCount(op));
|
|
|
| - EXPECT_EQ(0, OperatorProperties::GetValueOutputCount(op));
|
| - EXPECT_EQ(1, OperatorProperties::GetEffectOutputCount(op));
|
| - EXPECT_EQ(0, OperatorProperties::GetControlOutputCount(op));
|
| + EXPECT_EQ(0, op->ValueOutputCount());
|
| + EXPECT_EQ(1, op->EffectOutputCount());
|
| + EXPECT_EQ(0, op->ControlOutputCount());
|
| }
|
|
|
|
|
|
|