From 913c9155888873c1ae38fc2ab1d37cf271fc735f Mon Sep 17 00:00:00 2001 From: Victor Carlquist Date: Thu, 17 Sep 2015 09:24:36 -0300 Subject: [PATCH] Bug 984018 - Fixed build on Arm64; r=nbp --- js/src/jit/arm64/vixl/MozSimulator-vixl.cpp | 2 ++ js/src/jit/shared/Lowering-shared-inl.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp b/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp index c78b5660450..08389d2d1d8 100644 --- a/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp +++ b/js/src/jit/arm64/vixl/MozSimulator-vixl.cpp @@ -120,7 +120,9 @@ void Simulator::init(Decoder* decoder, FILE* stream) { lock_ = PR_NewLock(); if (!lock_) MOZ_CRASH("Could not allocate simulator lock."); +#ifdef DEBUG lockOwner_ = nullptr; +#endif redirection_ = nullptr; } diff --git a/js/src/jit/shared/Lowering-shared-inl.h b/js/src/jit/shared/Lowering-shared-inl.h index c151d17efa7..95e109da6ac 100644 --- a/js/src/jit/shared/Lowering-shared-inl.h +++ b/js/src/jit/shared/Lowering-shared-inl.h @@ -185,7 +185,7 @@ LIRGeneratorShared::defineSinCos(LInstructionHelper<2, Ops, Temps> *lir, MDefini uint32_t vreg = getVirtualRegister(); lir->setDef(0, LDefinition(vreg, LDefinition::DOUBLE, LFloatReg(ReturnDoubleReg))); #if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64) - lir->setDef(1, LDefinition(vreg + VREG_INCREMENT, LDefinition::DOUBLE, LFloatReg(d1))); + lir->setDef(1, LDefinition(vreg + VREG_INCREMENT, LDefinition::DOUBLE, LFloatReg(FloatRegisters::d1))); #elif defined(JS_CODEGEN_MIPS32) lir->setDef(1, LDefinition(vreg + VREG_INCREMENT, LDefinition::DOUBLE, LFloatReg(f2))); #elif defined(JS_CODEGEN_NONE)