Index: src/mips64/macro-assembler-mips64.cc |
diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc |
index b86697318a826e1ae92c541887ecf1f0b61e6f32..f409c0fb49a564d862437213a8fd3ad62cf92947 100644 |
--- a/src/mips64/macro-assembler-mips64.cc |
+++ b/src/mips64/macro-assembler-mips64.cc |
@@ -6958,7 +6958,7 @@ void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver_reg, |
Label* no_memento_found) { |
Label map_check; |
Label top_check; |
- ExternalReference new_space_allocation_top = |
+ 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; |
@@ -6968,7 +6968,9 @@ void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver_reg, |
// 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)); |
- Xor(scratch_reg, scratch_reg, Operand(new_space_allocation_top)); |
+ li(at, Operand(new_space_allocation_top_adr)); |
+ ld(at, MemOperand(at)); |
+ Xor(scratch_reg, scratch_reg, Operand(at)); |
And(scratch_reg, scratch_reg, Operand(~Page::kPageAlignmentMask)); |
Branch(&top_check, eq, scratch_reg, Operand(zero_reg)); |
// The object is on a different page than allocation top. Bail out if the |
@@ -6984,7 +6986,7 @@ void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver_reg, |
// we are below top. |
bind(&top_check); |
Daddu(scratch_reg, receiver_reg, Operand(kMementoEndOffset)); |
- li(at, Operand(new_space_allocation_top)); |
+ li(at, Operand(new_space_allocation_top_adr)); |
ld(at, MemOperand(at)); |
Branch(no_memento_found, gt, scratch_reg, Operand(at)); |
// Memento map check. |