Index: src/compiler/frame-states.cc |
diff --git a/src/compiler/frame-states.cc b/src/compiler/frame-states.cc |
index ec014dac9429ab3ce229def045aaeb74bf2fd8c3..021d9e9a2a4f5f0ea150513769927adbd336a8f5 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" |
@@ -65,6 +69,9 @@ 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::kGetterStub: |
os << "GETTER_STUB"; |
break; |
@@ -86,6 +93,99 @@ std::ostream& operator<<(std::ostream& os, FrameStateInfo const& info) { |
return os; |
} |
+namespace { |
+Node* CreateBuiltinContinuationFrameStateCommon( |
+ JSGraph* js_graph, Builtins::Name name, Node** parameters, |
+ int parameter_count, Node* outer_frame_state, |
+ Handle<SharedFunctionInfo> shared) { |
+ 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); |
+ |
+ const FrameStateFunctionInfo* state_info = |
+ common->CreateFrameStateFunctionInfo(FrameStateType::kBuiltinContinuation, |
+ parameter_count, 0, shared); |
+ const Operator* op = common->FrameState( |
+ bailout_id, OutputFrameStateCombine::Ignore(), state_info); |
+ const Operator* op0 = common->StateValues(0, SparseInputMask::Dense()); |
+ Node* node0 = graph->NewNode(op0); |
+ |
+ Node* frame_state = graph->NewNode( |
+ op, params_node, node0, node0, js_graph->UndefinedConstant(), |
Jarin
2017/05/24 06:41:22
node0 --> js_graph->EmptyStateValues()
danno
2017/06/06 12:04:52
Done.
|
+ js_graph->UndefinedConstant(), 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; |
+ if (descriptor.GetRegisterParameterCount() == 0) { |
+ actual_parameters.push_back(context); |
+ } |
+ for (int i = 0; i < parameter_count; ++i) { |
+ actual_parameters.push_back(parameters[i]); |
+ if (i == descriptor.GetRegisterParameterCount() - 1) { |
+ actual_parameters.push_back(context); |
+ } |
+ } |
+ |
+ return CreateBuiltinContinuationFrameStateCommon( |
+ js_graph, name, &actual_parameters[0], |
+ static_cast<int>(actual_parameters.size()), outer_frame_state, |
+ Handle<SharedFunctionInfo>()); |
+} |
+ |
+Node* CreateJavaScriptBuiltinContinuationFrameState( |
+ JSGraph* js_graph, Handle<SharedFunctionInfo> shared, 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)); |
+ std::vector<Node*> actual_parameters( |
+ {target, js_graph->UndefinedConstant(), argc, context}); |
+ |
+ for (int i = 0; i < stack_parameter_count; ++i) { |
+ actual_parameters.push_back(stack_parameters[i]); |
+ } |
+ |
+ return CreateBuiltinContinuationFrameStateCommon( |
+ js_graph, name, &actual_parameters[0], |
+ static_cast<int>(actual_parameters.size()), outer_frame_state, shared); |
+} |
+ |
} // namespace compiler |
} // namespace internal |
} // namespace v8 |