Index: src/ia32/builtins-ia32.cc |
diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc |
index 98ed645e0cfbfabedd70cc1495d191a8235cc40b..785c5fd61c219e1d87555f21c0d084e4f9d3a7a6 100644 |
--- a/src/ia32/builtins-ia32.cc |
+++ b/src/ia32/builtins-ia32.cc |
@@ -949,7 +949,7 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) { |
// Out of stack space. |
__ push(Operand(ebp, 4 * kPointerSize)); // push this |
__ push(eax); |
- __ InvokeBuiltin(Builtins::STACK_OVERFLOW, CALL_FUNCTION); |
+ __ InvokeBuiltin(Builtins::APPLY_OVERFLOW, CALL_FUNCTION); |
__ bind(&okay); |
// End of stack check. |
@@ -1252,33 +1252,6 @@ void Builtins::Generate_StringConstructCode(MacroAssembler* masm) { |
} |
-static void ArgumentsAdaptorStackCheck(MacroAssembler* masm, |
- Label* stack_overflow) { |
- // ----------- S t a t e ------------- |
- // -- eax : actual number of arguments |
- // -- ebx : expected number of arguments |
- // -- edi : function (passed through to callee) |
- // ----------------------------------- |
- // 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. |
- ExternalReference real_stack_limit = |
- ExternalReference::address_of_real_stack_limit(masm->isolate()); |
- __ mov(edx, Operand::StaticVariable(real_stack_limit)); |
- // Make ecx the space we have left. The stack might already be overflowed |
- // here which will cause ecx to become negative. |
- __ mov(ecx, esp); |
- __ sub(ecx, edx); |
- // Make edx the space we need for the array when it is unrolled onto the |
- // stack. |
- __ mov(edx, ebx); |
- __ shl(edx, kPointerSizeLog2); |
- // Check if the arguments will overflow the stack. |
- __ cmp(ecx, edx); |
- __ j(less_equal, stack_overflow); // Signed comparison. |
-} |
- |
- |
static void EnterArgumentsAdaptorFrame(MacroAssembler* masm) { |
__ push(ebp); |
__ mov(ebp, esp); |
@@ -1323,9 +1296,6 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { |
Label invoke, dont_adapt_arguments; |
__ IncrementCounter(masm->isolate()->counters()->arguments_adaptors(), 1); |
- Label stack_overflow; |
- ArgumentsAdaptorStackCheck(masm, &stack_overflow); |
- |
Label enough, too_few; |
__ mov(edx, FieldOperand(edi, JSFunction::kCodeEntryOffset)); |
__ cmp(eax, ebx); |
@@ -1400,11 +1370,6 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) { |
// ------------------------------------------- |
__ bind(&dont_adapt_arguments); |
__ jmp(edx); |
- |
- __ bind(&stack_overflow); |
- EnterArgumentsAdaptorFrame(masm); |
- __ InvokeBuiltin(Builtins::STACK_OVERFLOW, JUMP_FUNCTION); |
- __ int3(); |
} |