[turbofan] Factor out the function specific part from the frame state operator.

test/unittests/compiler/instruction-selector-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 "test/unittests/compiler/instruction-selector-unittest.h"
 
 #include "src/compiler/graph.h"
 #include "src/compiler/schedule.h"
 #include "src/flags.h"
 #include "test/unittests/compiler/compiler-test-utils.h"
@@ skipping 130 matching lines @@
 
 
 bool InstructionSelectorTest::Stream::IsUsedAtStart(
     const InstructionOperand* operand) const {
   if (!operand->IsUnallocated()) return false;
   const UnallocatedOperand* unallocated = UnallocatedOperand::cast(operand);
   return unallocated->IsUsedAtStart();
 }
 
 
+const FrameStateFunctionInfo*
+InstructionSelectorTest::StreamBuilder::GetFrameStateFunctionInfo(
+    int parameter_count, int local_count) {
+  return common()->CreateFrameStateFunctionInfo(
+      FrameStateType::kJavaScriptFunction, parameter_count, local_count,
+      Handle<SharedFunctionInfo>());
+}
+
+
 // -----------------------------------------------------------------------------
 // Return.
 
 
 TARGET_TEST_F(InstructionSelectorTest, ReturnFloat32Constant) {
   const float kValue = 4.2f;
   StreamBuilder m(this, kMachFloat32);
   m.Return(m.Float32Constant(kValue));
   Stream s = m.Build(kAllInstructions);
   ASSERT_EQ(3U, s.size());
@@ skipping 194 matching lines @@
 
   ZoneVector<MachineType> int32_type(1, kMachInt32, zone());
   ZoneVector<MachineType> empty_types(zone());
 
   Node* parameters =
       m.NewNode(m.common()->TypedStateValues(&int32_type), m.Int32Constant(1));
   Node* locals = m.NewNode(m.common()->TypedStateValues(&empty_types));
   Node* stack = m.NewNode(m.common()->TypedStateValues(&empty_types));
   Node* context_dummy = m.Int32Constant(0);
 
-  Node* state_node =
-      m.NewNode(m.common()->FrameState(JS_FRAME, bailout_id,
-                                       OutputFrameStateCombine::Push()),
-                parameters, locals, stack, context_dummy, function_node,
-                m.UndefinedConstant());
+  Node* state_node = m.NewNode(
+      m.common()->FrameState(bailout_id, OutputFrameStateCombine::Push(),
+                             m.GetFrameStateFunctionInfo(1, 0)),
+      parameters, locals, stack, context_dummy, function_node,
+      m.UndefinedConstant());
   Node* call = m.CallJS0(function_node, receiver, context, state_node);
   m.Return(call);
 
   Stream s = m.Build(kAllExceptNopInstructions);
 
   // Skip until kArchCallJSFunction.
   size_t index = 0;
   for (; index < s.size() && s[index]->arch_opcode() != kArchCallJSFunction;
        index++) {
   }
@@ skipping 24 matching lines @@
 
   // Build frame state for the state before the call.
   Node* parameters =
       m.NewNode(m.common()->TypedStateValues(&int32_type), m.Int32Constant(43));
   Node* locals = m.NewNode(m.common()->TypedStateValues(&float64_type),
                            m.Float64Constant(0.5));
   Node* stack = m.NewNode(m.common()->TypedStateValues(&tagged_type),
                           m.UndefinedConstant());
 
   Node* context_sentinel = m.Int32Constant(0);
-  Node* frame_state_before =
-      m.NewNode(m.common()->FrameState(JS_FRAME, bailout_id_before,
-                                       OutputFrameStateCombine::Push()),
-                parameters, locals, stack, context_sentinel, function_node,
-                m.UndefinedConstant());
+  Node* frame_state_before = m.NewNode(
+      m.common()->FrameState(bailout_id_before, OutputFrameStateCombine::Push(),
+                             m.GetFrameStateFunctionInfo(1, 1)),
+      parameters, locals, stack, context_sentinel, function_node,
+      m.UndefinedConstant());
 
   // Build the call.
   Node* call = m.CallFunctionStub0(function_node, receiver, context,
                                    frame_state_before, CALL_AS_METHOD);
 
   m.Return(call);
 
   Stream s = m.Build(kAllExceptNopInstructions);
 
   // Skip until kArchCallJSFunction.
@@ skipping 70 matching lines @@
   ZoneVector<MachineType> float64_type(1, kMachFloat64, zone());
 
   // Build frame state for the state before the call.
   Node* parameters =
       m.NewNode(m.common()->TypedStateValues(&int32_type), m.Int32Constant(63));
   Node* locals =
       m.NewNode(m.common()->TypedStateValues(&int32_type), m.Int32Constant(64));
   Node* stack =
       m.NewNode(m.common()->TypedStateValues(&int32_type), m.Int32Constant(65));
   Node* frame_state_parent = m.NewNode(
-      m.common()->FrameState(JS_FRAME, bailout_id_parent,
-                             OutputFrameStateCombine::Ignore()),
+      m.common()->FrameState(bailout_id_parent,
+                             OutputFrameStateCombine::Ignore(),
+                             m.GetFrameStateFunctionInfo(1, 1)),
       parameters, locals, stack, context, function_node, m.UndefinedConstant());
 
   Node* context2 = m.Int32Constant(46);
   Node* parameters2 =
       m.NewNode(m.common()->TypedStateValues(&int32_type), m.Int32Constant(43));
   Node* locals2 = m.NewNode(m.common()->TypedStateValues(&float64_type),
                             m.Float64Constant(0.25));
   Node* stack2 = m.NewNode(m.common()->TypedStateValues(&int32x2_type),
                            m.Int32Constant(44), m.Int32Constant(45));
-  Node* frame_state_before =
-      m.NewNode(m.common()->FrameState(JS_FRAME, bailout_id_before,
-                                       OutputFrameStateCombine::Push()),
-                parameters2, locals2, stack2, context2, function_node,
-                frame_state_parent);
+  Node* frame_state_before = m.NewNode(
+      m.common()->FrameState(bailout_id_before, OutputFrameStateCombine::Push(),
+                             m.GetFrameStateFunctionInfo(1, 1)),
+      parameters2, locals2, stack2, context2, function_node,
+      frame_state_parent);
 
   // Build the call.
   Node* call = m.CallFunctionStub0(function_node, receiver, context2,
                                    frame_state_before, CALL_AS_METHOD);
 
   m.Return(call);
 
   Stream s = m.Build(kAllExceptNopInstructions);
 
   // Skip until kArchCallJSFunction.
@@ skipping 60 matching lines @@
   EXPECT_EQ(s.ToVreg(context2), s.ToVreg(call_instr->InputAt(14)));
   // Continuation.
 
   EXPECT_EQ(kArchRet, s[index++]->arch_opcode());
   EXPECT_EQ(index, s.size());
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8