[turbofan] Unify frame state inputs.

test/unittests/compiler/js-operator-unittest.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/compiler/js-operator.h"
 #include "src/compiler/opcodes.h"
 #include "src/compiler/operator.h"
 #include "src/compiler/operator-properties.h"
 #include "test/unittests/test-utils.h"
 
@@ skipping 89 matching lines @@
   EXPECT_EQ((javascript1.*sop.constructor)(), (javascript2.*sop.constructor)());
 }
 
 
 TEST_P(JSSharedOperatorTest, NumberOfInputsAndOutputs) {
   JSOperatorBuilder javascript(zone());
   const SharedOperator& sop = GetParam();
   const Operator* op = (javascript.*sop.constructor)();
 
   const int context_input_count = 1;
-  // TODO(jarin): Get rid of this hack.
-  const int frame_state_input_count =
-      FLAG_turbo_deoptimization ? sop.frame_state_input_count : 0;
   EXPECT_EQ(sop.value_input_count, op->ValueInputCount());
   EXPECT_EQ(context_input_count, OperatorProperties::GetContextInputCount(op));
-  EXPECT_EQ(frame_state_input_count,
+  EXPECT_EQ(sop.frame_state_input_count,
             OperatorProperties::GetFrameStateInputCount(op));
   EXPECT_EQ(sop.effect_input_count, op->EffectInputCount());
   EXPECT_EQ(sop.control_input_count, op->ControlInputCount());
   EXPECT_EQ(sop.value_input_count + context_input_count +
-                frame_state_input_count + sop.effect_input_count +
+                sop.frame_state_input_count + sop.effect_input_count +
                 sop.control_input_count,
             OperatorProperties::GetTotalInputCount(op));
 
   EXPECT_EQ(sop.value_output_count, op->ValueOutputCount());
   EXPECT_EQ(sop.effect_output_count, op->EffectOutputCount());
   EXPECT_EQ(sop.control_output_count, op->ControlOutputCount());
 }
 
 
 TEST_P(JSSharedOperatorTest, OpcodeIsCorrect) {
@@ skipping 31 matching lines @@
   JSOperatorBuilder javascript2(zone());
   EXPECT_EQ(javascript1.StoreProperty(mode), javascript2.StoreProperty(mode));
 }
 
 
 TEST_P(JSStorePropertyOperatorTest, NumberOfInputsAndOutputs) {
   JSOperatorBuilder javascript(zone());
   const LanguageMode mode = GetParam();
   const Operator* op = javascript.StoreProperty(mode);
 
-  // TODO(jarin): Get rid of this hack.
-  const int frame_state_input_count = FLAG_turbo_deoptimization ? 2 : 0;
   EXPECT_EQ(3, op->ValueInputCount());
   EXPECT_EQ(1, OperatorProperties::GetContextInputCount(op));
-  EXPECT_EQ(frame_state_input_count,
-            OperatorProperties::GetFrameStateInputCount(op));
+  EXPECT_EQ(2, OperatorProperties::GetFrameStateInputCount(op));
   EXPECT_EQ(1, op->EffectInputCount());
   EXPECT_EQ(1, op->ControlInputCount());
-  EXPECT_EQ(6 + frame_state_input_count,
-            OperatorProperties::GetTotalInputCount(op));
+  EXPECT_EQ(8, OperatorProperties::GetTotalInputCount(op));
 
   EXPECT_EQ(0, op->ValueOutputCount());
   EXPECT_EQ(1, op->EffectOutputCount());
   EXPECT_EQ(2, op->ControlOutputCount());
 }
 
 
 TEST_P(JSStorePropertyOperatorTest, OpcodeIsCorrect) {
   JSOperatorBuilder javascript(zone());
   const LanguageMode mode = GetParam();
@@ skipping 17 matching lines @@
   EXPECT_EQ(Operator::kNoProperties, op->properties());
 }
 
 
 INSTANTIATE_TEST_CASE_P(JSOperatorTest, JSStorePropertyOperatorTest,
                         ::testing::Values(SLOPPY, STRICT));
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8