Index: src/arm64/builtins-arm64.cc |
diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc |
index b2c8ee087fa531b66378fb542fb26c8ff77d4dc0..01ac4cc5db6a3584434998612a589661e61e12d8 100644 |
--- a/src/arm64/builtins-arm64.cc |
+++ b/src/arm64/builtins-arm64.cc |
@@ -1280,7 +1280,7 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) { |
// There is not enough stack space, so use a builtin to throw an appropriate |
// error. |
__ Push(function, argc); |
- __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION); |
+ __ InvokeBuiltin(Builtins::APPLY_OVERFLOW, CALL_FUNCTION); |
// We should never return from the APPLY_OVERFLOW builtin. |
if (__ emit_debug_code()) { |
__ Unreachable(); |
@@ -1400,28 +1400,6 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) { |
} |
-static void ArgumentAdaptorStackCheck(MacroAssembler* masm, |
- Label* stack_overflow) { |
- // ----------- S t a t e ------------- |
- // -- x0 : actual number of arguments |
- // -- x1 : function (passed through to callee) |
- // -- x2 : expected number of arguments |
- // ----------------------------------- |
- // Check the stack for overflow. |
- // We are not trying to catch interruptions (e.g. debug break and |
- // preemption) here, so the "real stack limit" is checked. |
- Label enough_stack_space; |
- __ LoadRoot(x10, Heap::kRealStackLimitRootIndex); |
- // Make x10 the space we have left. The stack might already be overflowed |
- // here which will cause x10 to become negative. |
- __ Sub(x10, jssp, x10); |
- __ Mov(x11, jssp); |
- // Check if the arguments will overflow the stack. |
- __ Cmp(x10, Operand(x2, LSL, kPointerSizeLog2)); |
- __ B(le, stack_overflow); |
-} |
- |
- |
static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) { |
__ SmiTag(x10, x0); |
__ Mov(x11, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR)); |
@@ -1455,9 +1433,6 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { |
// -- x2 : expected number of arguments |
// ----------------------------------- |
- Label stack_overflow; |
- ArgumentAdaptorStackCheck(masm, &stack_overflow); |
- |
Register argc_actual = x0; // Excluding the receiver. |
Register argc_expected = x2; // Excluding the receiver. |
Register function = x1; |
@@ -1577,11 +1552,6 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { |
// Call the entry point without adapting the arguments. |
__ Bind(&dont_adapt_arguments); |
__ Jump(code_entry); |
- |
- __ Bind(&stack_overflow); |
- EnterArgumentsAdaptorFrame(masm); |
- __ InvokeBuiltin(Builtins::STACK_OVERFLOW, JUMP_FUNCTION); |
- __ Brk(0); |
} |