Index: src/compiler/js-builtin-reducer.cc |
diff --git a/src/compiler/js-builtin-reducer.cc b/src/compiler/js-builtin-reducer.cc |
index 426a707acaf112cfc2551e982544336aa3cf00bd..6db5f99e3b12aad0915b2fa3fafa0a89c2791efe 100644 |
--- a/src/compiler/js-builtin-reducer.cc |
+++ b/src/compiler/js-builtin-reducer.cc |
@@ -91,6 +91,41 @@ JSBuiltinReducer::JSBuiltinReducer(Editor* editor, JSGraph* jsgraph) |
: AdvancedReducer(editor), jsgraph_(jsgraph) {} |
+// ES6 section 19.2.3.3 Function.prototype.call (thisArg, ...args) |
+Reduction JSBuiltinReducer::ReduceFunctionCall(Node* node) { |
+ DCHECK_EQ(IrOpcode::kJSCallFunction, node->opcode()); |
+ CallFunctionParameters const& p = CallFunctionParametersOf(node->op()); |
+ Handle<JSFunction> apply = Handle<JSFunction>::cast( |
+ HeapObjectMatcher(NodeProperties::GetValueInput(node, 0)).Value()); |
+ // Change context of {node} to the Function.prototype.call context, |
+ // to ensure any exception is thrown in the correct context. |
+ NodeProperties::ReplaceContextInput( |
+ node, jsgraph()->HeapConstant(handle(apply->context(), isolate()))); |
+ // Remove the target from {node} and use the receiver as target instead, and |
+ // the thisArg becomes the new target. If thisArg was not provided, insert |
+ // undefined instead. |
+ size_t arity = p.arity(); |
+ DCHECK_LE(2u, arity); |
+ ConvertReceiverMode convert_mode; |
+ if (arity == 2) { |
+ // The thisArg was not provided, use undefined as receiver. |
+ convert_mode = ConvertReceiverMode::kNullOrUndefined; |
+ node->ReplaceInput(0, node->InputAt(1)); |
+ node->ReplaceInput(1, jsgraph()->UndefinedConstant()); |
+ } else { |
+ // Just remove the target, which is the first value input. |
+ convert_mode = ConvertReceiverMode::kAny; |
+ node->RemoveInput(0); |
+ --arity; |
+ } |
+ // TODO(turbofan): Migrate the call count to the new operator? |
+ NodeProperties::ChangeOp(node, javascript()->CallFunction( |
+ arity, p.language_mode(), VectorSlotPair(), |
+ convert_mode, p.tail_call_mode())); |
+ return Changed(node); |
+} |
+ |
+ |
// ECMA-262, section 15.8.2.11. |
Reduction JSBuiltinReducer::ReduceMathMax(Node* node) { |
JSCallReduction r(node); |
@@ -150,6 +185,8 @@ Reduction JSBuiltinReducer::Reduce(Node* node) { |
// Dispatch according to the BuiltinFunctionId if present. |
if (!r.HasBuiltinFunctionId()) return NoChange(); |
switch (r.GetBuiltinFunctionId()) { |
+ case kFunctionCall: |
+ return ReduceFunctionCall(node); |
case kMathMax: |
reduction = ReduceMathMax(node); |
break; |
@@ -174,6 +211,9 @@ Reduction JSBuiltinReducer::Reduce(Node* node) { |
Graph* JSBuiltinReducer::graph() const { return jsgraph()->graph(); } |
+Isolate* JSBuiltinReducer::isolate() const { return jsgraph()->isolate(); } |
+ |
+ |
CommonOperatorBuilder* JSBuiltinReducer::common() const { |
return jsgraph()->common(); |
} |
@@ -188,6 +228,11 @@ SimplifiedOperatorBuilder* JSBuiltinReducer::simplified() const { |
return jsgraph()->simplified(); |
} |
+ |
+JSOperatorBuilder* JSBuiltinReducer::javascript() const { |
+ return jsgraph()->javascript(); |
+} |
+ |
} // namespace compiler |
} // namespace internal |
} // namespace v8 |