Index: src/mips64/macro-assembler-mips64.cc |
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc |
index 8b47a9f16e14be0181b95ac76454e87fa1481823..d1d84ba40870f813dcb62ddb887b462c9263dd07 100644 |
--- a/src/mips64/macro-assembler-mips64.cc |
+++ b/src/mips64/macro-assembler-mips64.cc |
@@ -6962,13 +6962,14 @@ void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver_reg, |
ExternalReference new_space_allocation_top_adr = |
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. |
- Daddu(scratch_reg, receiver_reg, Operand(kMementoEndOffset)); |
+ Daddu(scratch_reg, receiver_reg, Operand(kMementoLastWordOffset)); |
li(at, Operand(new_space_allocation_top_adr)); |
ld(at, MemOperand(at)); |
Xor(scratch_reg, scratch_reg, Operand(at)); |
@@ -6977,7 +6978,7 @@ void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver_reg, |
// 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. |
- Daddu(scratch_reg, receiver_reg, Operand(kMementoEndOffset)); |
+ Daddu(scratch_reg, receiver_reg, Operand(kMementoLastWordOffset)); |
Xor(scratch_reg, scratch_reg, Operand(receiver_reg)); |
And(scratch_reg, scratch_reg, Operand(~Page::kPageAlignmentMask)); |
Branch(no_memento_found, ne, scratch_reg, Operand(zero_reg)); |
@@ -6986,10 +6987,10 @@ void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver_reg, |
// If top is on the same page as the current object, we need to check whether |
// we are below top. |
bind(&top_check); |
- Daddu(scratch_reg, receiver_reg, Operand(kMementoEndOffset)); |
+ Daddu(scratch_reg, receiver_reg, Operand(kMementoLastWordOffset)); |
li(at, Operand(new_space_allocation_top_adr)); |
ld(at, MemOperand(at)); |
- Branch(no_memento_found, gt, scratch_reg, Operand(at)); |
+ Branch(no_memento_found, ge, scratch_reg, Operand(at)); |
// Memento map check. |
bind(&map_check); |
ld(scratch_reg, MemOperand(receiver_reg, kMementoMapOffset)); |