Remove ambiguous getter for operator value counts.

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 754 matching lines @@
 TEST(CMergeReduce_edit_phi1) {
   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.Phi(kMachAnyTagged, 3), R.leaf[0],
                                 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));
     CHECK_EQ(merge, phi->InputAt(2));
   }
 }
 
 
 TEST(CMergeReduce_edit_effect_phi1) {
   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(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));
     CHECK_EQ(R.leaf[i < 2 ? 2 : 1], phi->InputAt(1));
     CHECK_EQ(merge, phi->InputAt(2));
   }
 }
 
 
 static const int kSelectorSize = 4;
@@ skipping 71 matching lines @@
       CHECK_EQ(values[selector.single_index()], phi_use->InputAt(0));
       CHECK_EQ(effects[selector.single_index()], ephi_use->InputAt(0));
     } 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, phi->op()->ValueInputCount());
       CHECK_EQ(count + 1, phi->InputCount());
       CHECK_EQ(count, ephi->op()->EffectInputCount());
       CHECK_EQ(count + 1, ephi->InputCount());
     }
   }
 }
 
 
 TEST(CMergeReduce_edit_many_phis1) {
   ControlReducerTester R;
 
   const int kPhiCount = 10;
   Node* phis[kPhiCount];
 
   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);
     for (int j = 0; j < kPhiCount; j++) {
       phis[j] = R.graph.NewNode(R.common.Phi(kMachAnyTagged, 3), R.leaf[0],
                                 R.leaf[1], R.leaf[2], merge);
     }
     R.ReduceMerge(merge, merge);
     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));
       CHECK_EQ(merge, phi->InputAt(2));
     }
   }
 }
 
 
 TEST(CMergeReduce_simple_chain1) {
@@ skipping 749 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);
 }