Index: src/x87/code-stubs-x87.cc |
diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc |
index c5b7896002f6809147445c52564cf9271125b7ff..e0cc2c0f50a9d5ed4ff9c19fe1e76f336bef7822 100644 |
--- a/src/x87/code-stubs-x87.cc |
+++ b/src/x87/code-stubs-x87.cc |
@@ -1498,13 +1498,16 @@ void CEntryStub::Generate(MacroAssembler* masm) { |
// Enter the exit frame that transitions from JavaScript to C++. |
if (argv_in_register()) { |
DCHECK(!save_doubles()); |
+ DCHECK(!is_builtin_exit()); |
__ EnterApiExitFrame(arg_stack_space); |
// Move argc and argv into the correct registers. |
__ mov(esi, ecx); |
__ mov(edi, eax); |
} else { |
- __ EnterExitFrame(arg_stack_space, save_doubles()); |
+ __ EnterExitFrame( |
+ arg_stack_space, save_doubles(), |
+ is_builtin_exit() ? StackFrame::BUILTIN_EXIT : StackFrame::EXIT); |
} |
// ebx: pointer to C function (C callee-saved) |