From a2d3815921938e7020171db04d46906698e31229 Mon Sep 17 00:00:00 2001 From: Heiher Date: Wed, 24 Aug 2016 23:59:55 +0800 Subject: [PATCH] Bug 1297581 - IonMonkey: MIPS64: Fix crash on running octane richards. r=jonco --- js/src/jit/mips64/MacroAssembler-mips64.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- js/src/jit/mips64/MacroAssembler-mips64.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/jit/mips64/MacroAssembler-mips64.cpp b/js/src/jit/mips64/MacroAssembler-mips64.cpp index c59785e82633..4c7809000e18 100644 --- a/js/src/jit/mips64/MacroAssembler-mips64.cpp +++ b/js/src/jit/mips64/MacroAssembler-mips64.cpp @@ -2293,9 +2293,9 @@ MacroAssembler::branchValueIsNurseryObjectImpl(Condition cond, const T& value, R Label done; branchTestObject(Assembler::NotEqual, value, cond == Assembler::Equal ? &done : label); - extractObject(value, temp); - orPtr(Imm32(gc::ChunkMask), temp); - branch32(cond, Address(temp, gc::ChunkLocationOffsetFromLastByte), + extractObject(value, SecondScratchReg); + orPtr(Imm32(gc::ChunkMask), SecondScratchReg); + branch32(cond, Address(SecondScratchReg, gc::ChunkLocationOffsetFromLastByte), Imm32(int32_t(gc::ChunkLocation::Nursery)), label); bind(&done);