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

test/unittests/compiler/liveness-analyzer-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-graph.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/liveness-analyzer.h"
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/state-values-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
@@ skipping 39 matching lines @@
 
     const Operator* locals_op = common()->StateValues(locals_count_);
 
     ZoneVector<Node*> local_inputs(locals_count_, nullptr, zone());
     for (int i = 0; i < locals_count_; i++) {
       local_inputs[i] = jsgraph()->Int32Constant(i + first_const);
     }
     Node* locals =
         graph()->NewNode(locals_op, locals_count_, &local_inputs.front());
 
+    const FrameStateFunctionInfo* state_info =
+        common()->CreateFrameStateFunctionInfo(
+            FrameStateType::kJavaScriptFunction, 0, locals_count_,
+            Handle<SharedFunctionInfo>());
+
     const Operator* op = common()->FrameState(
-        JS_FRAME, BailoutId(ast_num), OutputFrameStateCombine::Ignore());
+        BailoutId(ast_num), OutputFrameStateCombine::Ignore(), state_info);
     Node* result = graph()->NewNode(op, empty_values_, locals, empty_values_,
                                     jsgraph()->UndefinedConstant(),
                                     jsgraph()->UndefinedConstant());
 
     current_block_->Checkpoint(result);
     return result;
   }
 
   void Bind(int var) { current_block()->Bind(var); }
   void Lookup(int var) { current_block()->Lookup(var); }
@@ skipping 14 matching lines @@
     }
 
     bool MatchAndExplain(Node* frame_state,
                          MatchResultListener* listener) const override {
       if (frame_state == NULL) {
         *listener << "which is NULL";
         return false;
       }
       DCHECK(frame_state->opcode() == IrOpcode::kFrameState);
 
-      FrameStateCallInfo state_info =
-          OpParameter<FrameStateCallInfo>(frame_state);
+      FrameStateInfo state_info = OpParameter<FrameStateInfo>(frame_state);
       int ast_num = state_info.bailout_id().ToInt();
       int first_const = intconst_from_bailout_id(ast_num, locals_count_);
 
       if (empty_values_ != frame_state->InputAt(0)) {
         *listener << "whose parameters are " << frame_state->InputAt(0)
                   << " but should have been " << empty_values_ << " (empty)";
         return false;
       }
       if (empty_values_ != frame_state->InputAt(2)) {
         *listener << "whose expression stack is " << frame_state->InputAt(2)
@@ skipping 256 matching lines @@
   EXPECT_THAT(c1_in_loop, IsCheckpointModuloLiveness(".L.L"));
   EXPECT_THAT(c2_in_loop, IsCheckpointModuloLiveness("LL.L"));
 
   EXPECT_THAT(c1_end, IsCheckpointModuloLiveness(".LL."));
   EXPECT_THAT(c2_end, IsCheckpointModuloLiveness("...."));
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8