[turbofan] Unify frame state inputs.

test/unittests/compiler/js-intrinsic-lowering-unittest.cc

 // Copyright 2015 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/code-factory.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/diamond.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-intrinsic-lowering.h"
 #include "src/compiler/js-operator.h"
@@ skipping 20 matching lines @@
 
  protected:
   Reduction Reduce(Node* node, MachineOperatorBuilder::Flags flags =
                                    MachineOperatorBuilder::kNoFlags) {
     MachineOperatorBuilder machine(zone(), kMachPtr, flags);
     JSGraph jsgraph(isolate(), graph(), common(), javascript(), &machine);
     JSIntrinsicLowering reducer(&jsgraph);
     return reducer.Reduce(node);
   }
 
+  Node* EmptyFrameState() {
+    MachineOperatorBuilder machine(zone());
+    JSGraph jsgraph(isolate(), graph(), common(), javascript(), &machine);
+    return jsgraph.EmptyFrameState();
+  }
+
   JSOperatorBuilder* javascript() { return &javascript_; }
 
  private:
   JSOperatorBuilder javascript_;
 };
 
 
 // -----------------------------------------------------------------------------
 // %_ConstructDouble
 
@@ skipping 13 matching lines @@
                                        IsNumberConstant(BitEq(0.0)), input1),
                                    input0));
 }
 
 
 // -----------------------------------------------------------------------------
 // %_CreateArrayLiteral
 
 
 TEST_F(JSIntrinsicLoweringTest, InlineCreateArrayLiteral) {
-  i::FLAG_turbo_deoptimization = false;
   Node* const input0 = Parameter(0);
   Node* const input1 = Parameter(1);
   Node* const input2 = HeapConstant(factory()->NewFixedArray(12));
   Node* const input3 = NumberConstant(ArrayLiteral::kShallowElements);
   Node* const context = Parameter(2);
+  Node* const frame_state = EmptyFrameState();
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   Reduction const r = Reduce(graph()->NewNode(
       javascript()->CallRuntime(Runtime::kInlineCreateArrayLiteral, 4), input0,
-      input1, input2, input3, context, effect, control));
+      input1, input2, input3, context, frame_state, effect, control));
   ASSERT_TRUE(r.Changed());
   EXPECT_THAT(
       r.replacement(),
       IsCall(_, IsHeapConstant(Unique<HeapObject>::CreateImmovable(
                     CodeFactory::FastCloneShallowArray(isolate()).code())),
-             input0, input1, input2, effect, control));
+             input0, input1, input2, context, frame_state, effect, control));
 }
 
 
 // -----------------------------------------------------------------------------
 // %_CreateObjectLiteral
 
 
 TEST_F(JSIntrinsicLoweringTest, InlineCreateObjectLiteral) {
-  i::FLAG_turbo_deoptimization = false;
   Node* const input0 = Parameter(0);
   Node* const input1 = Parameter(1);
   Node* const input2 = HeapConstant(factory()->NewFixedArray(2 * 6));
   Node* const input3 = NumberConstant(ObjectLiteral::kShallowProperties);
   Node* const context = Parameter(2);
+  Node* const frame_state = EmptyFrameState();
   Node* const effect = graph()->start();
   Node* const control = graph()->start();
   Reduction const r = Reduce(graph()->NewNode(
       javascript()->CallRuntime(Runtime::kInlineCreateObjectLiteral, 4), input0,
-      input1, input2, input3, context, effect, control));
+      input1, input2, input3, context, frame_state, effect, control));
   ASSERT_TRUE(r.Changed());
   EXPECT_THAT(
       r.replacement(),
       IsCall(_, IsHeapConstant(Unique<HeapObject>::CreateImmovable(
                     CodeFactory::FastCloneShallowObject(isolate(), 6).code())),
-             input0, input1, input2, effect, control));
+             input0, input1, input2, input3, context, frame_state, effect,
+             control));
 }
 
 
 // -----------------------------------------------------------------------------
 // %_DoubleLo
 
 
 TEST_F(JSIntrinsicLoweringTest, InlineOptimizedDoubleLo) {
   Node* const input = Parameter(0);
   Node* const context = Parameter(1);
@@ skipping 326 matching lines @@
                             CaptureEq(&if_false0)))))),
           IsMerge(
               IsIfTrue(AllOf(CaptureEq(&branch0),
                              IsBranch(IsObjectIsSmi(input), control))),
               AllOf(CaptureEq(&if_false0), IsIfFalse(CaptureEq(&branch0))))));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8