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

Unified Diff: src/x64/macro-assembler-x64.cc

Issue 6627046: X64 Crankshaft: Fix bug in DoStoreContextSlot, and enable it. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 9 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
« no previous file with comments | « src/x64/lithium-x64.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/x64/macro-assembler-x64.cc
===================================================================
--- src/x64/macro-assembler-x64.cc (revision 7070)
+++ src/x64/macro-assembler-x64.cc (working copy)
@@ -95,7 +95,13 @@
if (FLAG_debug_code) {
// Check that the object is not in new space.
NearLabel not_in_new_space;
- InNewSpace(object, scratch, not_equal, &not_in_new_space);
+ if (addr.is(kScratchRegister)) {
+ push(kScratchRegister);
+ InNewSpace(object, scratch, not_equal, &not_in_new_space);
+ pop(kScratchRegister);
+ } else {
+ InNewSpace(object, scratch, not_equal, &not_in_new_space);
+ }
Abort("new-space object passed to RecordWriteHelper");
bind(&not_in_new_space);
}
« no previous file with comments | « src/x64/lithium-x64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698