[turbofan] Unify frame state inputs.

test/unittests/compiler/js-typed-lowering-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/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/js-typed-lowering.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-properties.h"
@@ skipping 399 matching lines @@
 // -----------------------------------------------------------------------------
 // JSToNumber
 
 
 TEST_F(JSTypedLoweringTest, JSToNumberWithPlainPrimitive) {
   Node* const input = Parameter(Type::PlainPrimitive(), 0);
   Node* const context = Parameter(Type::Any(), 1);
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   Reduction r =
-      FLAG_turbo_deoptimization
-          ? Reduce(graph()->NewNode(javascript()->ToNumber(), input, context,
-                                    EmptyFrameState(), effect, control))
-          : Reduce(graph()->NewNode(javascript()->ToNumber(), input, context,
-                                    effect, control));
+      Reduce(graph()->NewNode(javascript()->ToNumber(), input, context,
+                              EmptyFrameState(), effect, control));
   ASSERT_TRUE(r.Changed());
   EXPECT_THAT(r.replacement(), IsToNumber(input, IsNumberConstant(BitEq(0.0)),
                                           graph()->start(), control));
 }
 
 
 // -----------------------------------------------------------------------------
 // JSStrictEqual
 
 
@@ skipping 197 matching lines @@
     Handle<JSTypedArray> array =
         factory()->NewJSTypedArray(type, buffer, 0, kLength);
     int const element_size = static_cast<int>(array->element_size());
 
     Node* key = Parameter(
         Type::Range(kMinInt / element_size, kMaxInt / element_size, zone()));
     Node* base = HeapConstant(array);
     Node* context = UndefinedConstant();
     Node* effect = graph()->start();
     Node* control = graph()->start();
-    Node* node = graph()->NewNode(javascript()->LoadProperty(feedback), base,
-                                  key, context);
-    if (FLAG_turbo_deoptimization) {
-      node->AppendInput(zone(), UndefinedConstant());
-    }
-    node->AppendInput(zone(), effect);
-    node->AppendInput(zone(), control);
-    Reduction r = Reduce(node);
+    Reduction r =
+        Reduce(graph()->NewNode(javascript()->LoadProperty(feedback), base, key,
+                                context, EmptyFrameState(), effect, control));
 
     Matcher<Node*> offset_matcher =
         element_size == 1
             ? key
             : IsWord32Shl(key, IsInt32Constant(WhichPowerOf2(element_size)));
 
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
         IsLoadBuffer(BufferAccess(type),
@@ skipping 18 matching lines @@
     ElementAccess access = AccessBuilder::ForTypedArrayElement(type, true);
 
     int min = random_number_generator()->NextInt(static_cast<int>(kLength));
     int max = random_number_generator()->NextInt(static_cast<int>(kLength));
     if (min > max) std::swap(min, max);
     Node* key = Parameter(Type::Range(min, max, zone()));
     Node* base = HeapConstant(array);
     Node* context = UndefinedConstant();
     Node* effect = graph()->start();
     Node* control = graph()->start();
-    Node* node = graph()->NewNode(javascript()->LoadProperty(feedback), base,
-                                  key, context);
-    if (FLAG_turbo_deoptimization) {
-      node->AppendInput(zone(), UndefinedConstant());
-    }
-    node->AppendInput(zone(), effect);
-    node->AppendInput(zone(), control);
-    Reduction r = Reduce(node);
+    Reduction r =
+        Reduce(graph()->NewNode(javascript()->LoadProperty(feedback), base, key,
+                                context, EmptyFrameState(), effect, control));
 
     ASSERT_TRUE(r.Changed());
     EXPECT_THAT(
         r.replacement(),
         IsLoadElement(access,
                       IsIntPtrConstant(bit_cast<intptr_t>(&backing_store[0])),
                       key, effect, control));
   }
 }
 
@@ skipping 162 matching lines @@
 
   VectorSlotPair feedback(Handle<TypeFeedbackVector>::null(),
                           FeedbackVectorICSlot::Invalid());
   Node* global = Parameter(Type::GlobalObject());
   Node* context = UndefinedConstant();
   Node* effect = graph()->start();
   Node* control = graph()->start();
 
   for (size_t i = 0; i < arraysize(names); i++) {
     Unique<Name> name = Unique<Name>::CreateImmovable(names[i]);
-    Node* node = graph()->NewNode(javascript()->LoadNamed(name, feedback),
-                                  global, context);
-    if (FLAG_turbo_deoptimization) {
-      node->AppendInput(zone(), EmptyFrameState());
-    }
-    node->AppendInput(zone(), effect);
-    node->AppendInput(zone(), control);
+    Reduction r =
+        Reduce(graph()->NewNode(javascript()->LoadNamed(name, feedback), global,
+                                context, EmptyFrameState(), effect, control));
 
-    Reduction r = Reduce(node);
-
+    ASSERT_TRUE(r.Changed());
     EXPECT_THAT(r.replacement(), matches[i]);
   }
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8