Inline trivial OperatorProperties methods.

test/cctest/compiler/test-control-reducer.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/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/base/bits.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/control-reducer.h"
@@ skipping 19 matching lines @@
   if (i1 != NULL) CHECK_EQ(i1, node->InputAt(1));
   if (i2 != NULL) CHECK_EQ(i2, node->InputAt(2));
   return count;
 }
 
 
 static int CheckMerge(Node* node, Node* i0 = NULL, Node* i1 = NULL,
                       Node* i2 = NULL) {
   CHECK_EQ(IrOpcode::kMerge, node->opcode());
   int count = CheckInputs(node, i0, i1, i2);
-  CHECK_EQ(count, OperatorProperties::GetControlInputCount(node->op()));
+  CHECK_EQ(count, node->op()->ControlInputCount());
   return count;
 }
 
 
 static int CheckLoop(Node* node, Node* i0 = NULL, Node* i1 = NULL,
                      Node* i2 = NULL) {
   CHECK_EQ(IrOpcode::kLoop, node->opcode());
   int count = CheckInputs(node, i0, i1, i2);
-  CHECK_EQ(count, OperatorProperties::GetControlInputCount(node->op()));
+  CHECK_EQ(count, node->op()->ControlInputCount());
   return count;
 }
 
 
 bool IsUsedBy(Node* a, Node* b) {
   for (UseIter i = a->uses().begin(); i != a->uses().end(); ++i) {
     if (b == *i) return true;
   }
   return false;
 }
@@ skipping 725 matching lines @@
   ControlReducerTester R;
 
   for (int i = 0; i < 3; i++) {
     Node* merge = R.graph.NewNode(R.common.Merge(3), R.start, R.start, R.start);
     merge->ReplaceInput(i, R.dead);
     Node* phi = R.graph.NewNode(R.common.EffectPhi(3), R.leaf[0], R.leaf[1],
                                 R.leaf[2], merge);
     R.ReduceMerge(merge, merge);
     CHECK_EQ(IrOpcode::kEffectPhi, phi->opcode());
     CHECK_EQ(0, phi->op()->InputCount());
-    CHECK_EQ(2, OperatorProperties::GetEffectInputCount(phi->op()));
+    CHECK_EQ(2, phi->op()->EffectInputCount());
     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));
     CHECK_EQ(merge, phi->InputAt(2));
   }
 }
 
 
 static const int kSelectorSize = 4;
 
@@ skipping 72 matching lines @@
     } else {
       // Otherwise, nodes should be edited in place.
       CHECK_EQ(merge, result);
       selector.CheckNode(merge, IrOpcode::kMerge, controls, NULL);
       selector.CheckNode(phi, IrOpcode::kPhi, values, merge);
       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 + 1, phi->InputCount());
-      CHECK_EQ(count, OperatorProperties::GetEffectInputCount(ephi->op()));
+      CHECK_EQ(count, ephi->op()->EffectInputCount());
       CHECK_EQ(count + 1, ephi->InputCount());
     }
   }
 }
 
 
 TEST(CMergeReduce_edit_many_phis1) {
   ControlReducerTester R;
 
   const int kPhiCount = 10;
@@ skipping 368 matching lines @@
   Node* end = R.graph.end();
   end->ReplaceInput(0, b.if_false);
 
   R.ReduceGraph();
 
   CHECK_EQ(end, R.graph.end());
   CheckLoop(loop, R.start, loop);
   Node* terminate = end->InputAt(0);
   CHECK_EQ(IrOpcode::kTerminate, terminate->opcode());
   CHECK_EQ(2, terminate->InputCount());
-  CHECK_EQ(1, OperatorProperties::GetEffectInputCount(terminate->op()));
-  CHECK_EQ(1, OperatorProperties::GetControlInputCount(terminate->op()));
+  CHECK_EQ(1, terminate->op()->EffectInputCount());
+  CHECK_EQ(1, terminate->op()->ControlInputCount());
   CheckInputs(terminate, effect, loop);
 }
 
 
 TEST(CNonTermLoop_terminate2) {
   ControlReducerTester R;
   Node* loop = R.graph.NewNode(R.common.Loop(2), R.start, R.start);
   Node* effect1 = R.SetSelfReferences(
       R.graph.NewNode(R.common.EffectPhi(2), R.start, R.self, loop));
   Node* effect2 = R.SetSelfReferences(
       R.graph.NewNode(R.common.EffectPhi(2), R.start, R.self, loop));
   Branch b(R, R.one, loop);
   loop->ReplaceInput(1, b.if_true);
   Node* end = R.graph.end();
   end->ReplaceInput(0, b.if_false);
 
   R.ReduceGraph();
 
   CheckLoop(loop, R.start, loop);
   CHECK_EQ(end, R.graph.end());
   Node* terminate = end->InputAt(0);
   CHECK_EQ(IrOpcode::kTerminate, terminate->opcode());
   CHECK_EQ(3, terminate->InputCount());
-  CHECK_EQ(2, OperatorProperties::GetEffectInputCount(terminate->op()));
-  CHECK_EQ(1, OperatorProperties::GetControlInputCount(terminate->op()));
+  CHECK_EQ(2, terminate->op()->EffectInputCount());
+  CHECK_EQ(1, terminate->op()->ControlInputCount());
   Node* e0 = terminate->InputAt(0);
   Node* e1 = terminate->InputAt(1);
   CHECK(e0 == effect1 || e1 == effect1);
   CHECK(e0 == effect2 || e1 == effect2);
   CHECK_EQ(loop, terminate->InputAt(2));
 }
 
 
 TEST(CNonTermLoop_terminate_m1) {
   ControlReducerTester R;
   Node* loop =
       R.SetSelfReferences(R.graph.NewNode(R.common.Loop(2), R.start, R.self));
   Node* effect = R.SetSelfReferences(
       R.graph.NewNode(R.common.EffectPhi(2), R.start, R.self, loop));
   R.ReduceGraph();
   Node* end = R.graph.end();
   CHECK_EQ(R.start, loop->InputAt(0));
   CHECK_EQ(loop, loop->InputAt(1));
   Node* merge = end->InputAt(0);
   CHECK_EQ(IrOpcode::kMerge, merge->opcode());
   CHECK_EQ(2, merge->InputCount());
-  CHECK_EQ(2, OperatorProperties::GetControlInputCount(merge->op()));
+  CHECK_EQ(2, merge->op()->ControlInputCount());
   CHECK_EQ(R.start, merge->InputAt(0));
 
   Node* terminate = merge->InputAt(1);
   CHECK_EQ(IrOpcode::kTerminate, terminate->opcode());
   CHECK_EQ(2, terminate->InputCount());
-  CHECK_EQ(1, OperatorProperties::GetEffectInputCount(terminate->op()));
-  CHECK_EQ(1, OperatorProperties::GetControlInputCount(terminate->op()));
+  CHECK_EQ(1, terminate->op()->EffectInputCount());
+  CHECK_EQ(1, terminate->op()->ControlInputCount());
   CHECK_EQ(effect, terminate->InputAt(0));
   CHECK_EQ(loop, terminate->InputAt(1));
 }
 
 
 TEST(CNonTermLoop_big1) {
   ControlReducerTester R;
   Branch b1(R, R.p0);
   Node* rt = R.graph.NewNode(R.common.Return(), R.one, R.start, b1.if_true);
 
@@ skipping 328 matching lines @@
 
   Node* ret = R.Return(d1.phi, R.start, d1.merge);
 
   R.ReduceGraph();  // d1 gets folded true.
 
   CheckInputs(ret, y2, R.start, R.start);
   CheckDeadDiamond(d1);
   CheckDeadDiamond(d2);
   CheckDeadDiamond(d3);
 }