Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2049)

Unified Diff: src/x64/codegen-x64.cc

Issue 6447007: Fix a bug that occurs when functions are defined with more than 16,382 parame... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/x64/codegen-x64.cc
===================================================================
--- src/x64/codegen-x64.cc (revision 6683)
+++ src/x64/codegen-x64.cc (working copy)
@@ -2993,7 +2993,15 @@
// Leave the frame and return popping the arguments and the
// receiver.
frame_->Exit();
- masm_->ret((scope()->num_parameters() + 1) * kPointerSize);
+ int arguments_bytes = (scope()->num_parameters() + 1) * kPointerSize;
+ if (is_uint16(arguments_bytes)) {
+ __ ret(arguments_bytes);
+ } else {
+ __ pop(rcx);
+ __ addq(rsp, Immediate(arguments_bytes));
+ __ push(rcx);
+ __ ret(0);
+ }
DeleteFrame();
#ifdef ENABLE_DEBUGGER_SUPPORT
@@ -3006,8 +3014,8 @@
}
// Check that the size of the code used for returning matches what is
// expected by the debugger.
- ASSERT_EQ(Assembler::kJSReturnSequenceLength,
- masm_->SizeOfCodeGeneratedSince(&check_exit_codesize));
+ ASSERT(Assembler::kJSReturnSequenceLength <=
+ masm_->SizeOfCodeGeneratedSince(&check_exit_codesize));
#endif
}

Powered by Google App Engine
This is Rietveld 408576698