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

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

Issue 2466573002: [stubs] Fix allocation memento detection. (Closed)
Patch Set: Created 4 years, 1 month 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/code-stub-assembler.cc ('k') | src/mips/macro-assembler-mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/macro-assembler-ia32.cc
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
index 41ee902a5945b2bdb1a0686ba4323f8ec51518d8..2fa9d0eda5e4351ae0503bd9cd0c0a1e44500847 100644
--- a/src/ia32/macro-assembler-ia32.cc
+++ b/src/ia32/macro-assembler-ia32.cc
@@ -3130,20 +3130,21 @@ void MacroAssembler::TestJSArrayForAllocationMemento(
ExternalReference new_space_allocation_top =
ExternalReference::new_space_allocation_top_address(isolate());
const int kMementoMapOffset = JSArray::kSize - kHeapObjectTag;
- const int kMementoEndOffset = kMementoMapOffset + AllocationMemento::kSize;
+ const int kMementoLastWordOffset =
+ kMementoMapOffset + AllocationMemento::kSize - kPointerSize;
// Bail out if the object is not in new space.
JumpIfNotInNewSpace(receiver_reg, scratch_reg, no_memento_found);
// If the object is in new space, we need to check whether it is on the same
// page as the current top.
- lea(scratch_reg, Operand(receiver_reg, kMementoEndOffset));
+ lea(scratch_reg, Operand(receiver_reg, kMementoLastWordOffset));
xor_(scratch_reg, Operand::StaticVariable(new_space_allocation_top));
test(scratch_reg, Immediate(~Page::kPageAlignmentMask));
j(zero, &top_check);
// The object is on a different page than allocation top. Bail out if the
// object sits on the page boundary as no memento can follow and we cannot
// touch the memory following it.
- lea(scratch_reg, Operand(receiver_reg, kMementoEndOffset));
+ lea(scratch_reg, Operand(receiver_reg, kMementoLastWordOffset));
xor_(scratch_reg, receiver_reg);
test(scratch_reg, Immediate(~Page::kPageAlignmentMask));
j(not_zero, no_memento_found);
@@ -3152,9 +3153,9 @@ void MacroAssembler::TestJSArrayForAllocationMemento(
// If top is on the same page as the current object, we need to check whether
// we are below top.
bind(&top_check);
- lea(scratch_reg, Operand(receiver_reg, kMementoEndOffset));
+ lea(scratch_reg, Operand(receiver_reg, kMementoLastWordOffset));
cmp(scratch_reg, Operand::StaticVariable(new_space_allocation_top));
- j(greater, no_memento_found);
+ j(greater_equal, no_memento_found);
// Memento map check.
bind(&map_check);
mov(scratch_reg, Operand(receiver_reg, kMementoMapOffset));
« no previous file with comments | « src/code-stub-assembler.cc ('k') | src/mips/macro-assembler-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698