| Index: src/compiler/frame-states.cc
|
| diff --git a/src/compiler/frame-states.cc b/src/compiler/frame-states.cc
|
| index b5064343bd71a6c501d9766681f30af6fd334f08..c5fab683d9d84736abc21ca2d2fe00a733b8b8d9 100644
|
| --- a/src/compiler/frame-states.cc
|
| +++ b/src/compiler/frame-states.cc
|
| @@ -5,6 +5,10 @@
|
| #include "src/compiler/frame-states.h"
|
|
|
| #include "src/base/functional.h"
|
| +#include "src/callable.h"
|
| +#include "src/compiler/graph.h"
|
| +#include "src/compiler/js-graph.h"
|
| +#include "src/compiler/node.h"
|
| #include "src/handles-inl.h"
|
| #include "src/objects-inl.h"
|
|
|
| @@ -64,6 +68,12 @@ std::ostream& operator<<(std::ostream& os, FrameStateType type) {
|
| case FrameStateType::kConstructStub:
|
| os << "CONSTRUCT_STUB";
|
| break;
|
| + case FrameStateType::kBuiltinContinuation:
|
| + os << "BUILTIN_CONTINUATION_FRAME";
|
| + break;
|
| + case FrameStateType::kJavaScriptBuiltinContinuation:
|
| + os << "JAVA_SCRIPT_BUILTIN_CONTINUATION_FRAME";
|
| + break;
|
| case FrameStateType::kGetterStub:
|
| os << "GETTER_STUB";
|
| break;
|
| @@ -85,6 +95,112 @@ std::ostream& operator<<(std::ostream& os, FrameStateInfo const& info) {
|
| return os;
|
| }
|
|
|
| +namespace {
|
| +Node* CreateBuiltinContinuationFrameStateCommon(
|
| + JSGraph* js_graph, Builtins::Name name, Node* context, Node** parameters,
|
| + int parameter_count, Node* outer_frame_state, Handle<JSFunction> function) {
|
| + Isolate* isolate = js_graph->isolate();
|
| + Graph* graph = js_graph->graph();
|
| + CommonOperatorBuilder* common = js_graph->common();
|
| +
|
| + BailoutId bailout_id = Builtins::GetContinuationBailoutId(name);
|
| + Callable callable = Builtins::CallableFor(isolate, name);
|
| +
|
| + const Operator* op_param =
|
| + common->StateValues(parameter_count, SparseInputMask::Dense());
|
| + Node* params_node = graph->NewNode(op_param, parameter_count, parameters);
|
| +
|
| + FrameStateType frame_type =
|
| + function.is_null() ? FrameStateType::kBuiltinContinuation
|
| + : FrameStateType::kJavaScriptBuiltinContinuation;
|
| + Handle<SharedFunctionInfo> shared(
|
| + Handle<SharedFunctionInfo>(function->shared()));
|
| + const FrameStateFunctionInfo* state_info =
|
| + common->CreateFrameStateFunctionInfo(frame_type, parameter_count, 0,
|
| + shared);
|
| + const Operator* op = common->FrameState(
|
| + bailout_id, OutputFrameStateCombine::Ignore(), state_info);
|
| +
|
| + Node* function_node = function.is_null() ? js_graph->UndefinedConstant()
|
| + : js_graph->HeapConstant(function);
|
| +
|
| + Node* frame_state = graph->NewNode(
|
| + op, params_node, js_graph->EmptyStateValues(),
|
| + js_graph->EmptyStateValues(), context, function_node, outer_frame_state);
|
| +
|
| + return frame_state;
|
| +}
|
| +} // namespace
|
| +
|
| +Node* CreateStubBuiltinContinuationFrameState(JSGraph* js_graph,
|
| + Builtins::Name name,
|
| + Node* context, Node** parameters,
|
| + int parameter_count,
|
| + Node* outer_frame_state,
|
| + ContinuationFrameStateMode mode) {
|
| + Isolate* isolate = js_graph->isolate();
|
| + Callable callable = Builtins::CallableFor(isolate, name);
|
| + CallInterfaceDescriptor descriptor = callable.descriptor();
|
| +
|
| + std::vector<Node*> actual_parameters;
|
| + // Stack parameters first
|
| + for (int i = 0; i < descriptor.GetStackParameterCount(); ++i) {
|
| + actual_parameters.push_back(
|
| + parameters[descriptor.GetRegisterParameterCount() + i]);
|
| + }
|
| + // Register parameters follow, context will be added by instruction selector
|
| + // during FrameState translation.
|
| + for (int i = 0; i < descriptor.GetRegisterParameterCount(); ++i) {
|
| + actual_parameters.push_back(parameters[i]);
|
| + }
|
| +
|
| + return CreateBuiltinContinuationFrameStateCommon(
|
| + js_graph, name, context, &actual_parameters[0],
|
| + static_cast<int>(actual_parameters.size()), outer_frame_state,
|
| + Handle<JSFunction>());
|
| +}
|
| +
|
| +Node* CreateJavaScriptBuiltinContinuationFrameState(
|
| + JSGraph* js_graph, Handle<JSFunction> function, Builtins::Name name,
|
| + Node* target, Node* context, Node** stack_parameters,
|
| + int stack_parameter_count, Node* outer_frame_state,
|
| + ContinuationFrameStateMode mode) {
|
| + Isolate* isolate = js_graph->isolate();
|
| + Callable callable = Builtins::CallableFor(isolate, name);
|
| +
|
| + // Lazy deopt points where the frame state is assocated with a call get an
|
| + // additional parameter for the return result from the call that's added by
|
| + // the deoptimizer and not explicitly specified in the frame state. Check that
|
| + // there is not a mismatch between the number of frame state parameters and
|
| + // the stack parameters required by the builtin taking this into account.
|
| + DCHECK_EQ(
|
| + Builtins::GetStackParameterCount(isolate, name) + 1, // add receiver
|
| + stack_parameter_count +
|
| + (mode == ContinuationFrameStateMode::EAGER ? 0 : 1));
|
| +
|
| + Node* argc =
|
| + js_graph->Constant(stack_parameter_count -
|
| + (mode == ContinuationFrameStateMode::EAGER ? 1 : 0));
|
| +
|
| + // Stack parameters first. They must be first because the receiver is expected
|
| + // to be the second value in the translation when creating stack crawls
|
| + // (e.g. Error.stack) of optimized JavaScript frames.
|
| + std::vector<Node*> actual_parameters;
|
| + for (int i = 0; i < stack_parameter_count; ++i) {
|
| + actual_parameters.push_back(stack_parameters[i]);
|
| + }
|
| +
|
| + // Register parameters follow stack paraemters. The context will be added by
|
| + // instruction selector during FrameState translation.
|
| + actual_parameters.push_back(target);
|
| + actual_parameters.push_back(js_graph->UndefinedConstant());
|
| + actual_parameters.push_back(argc);
|
| +
|
| + return CreateBuiltinContinuationFrameStateCommon(
|
| + js_graph, name, context, &actual_parameters[0],
|
| + static_cast<int>(actual_parameters.size()), outer_frame_state, function);
|
| +}
|
| +
|
| } // namespace compiler
|
| } // namespace internal
|
| } // namespace v8
|
|
|