Land bug 996883. r=mjrosenb
authorDouglas Crosher <dtc-moz@scieneer.com>
Thu, 17 Apr 2014 00:08:21 +1000
changeset 197809 d8300867f3f219a3d183ee0577d548d04f802d8c
parent 197808 5d9fb05d9d12399f0a1ba7df55fbb8d2e38ab844
child 197810 45a45f4a228fa68e3748735b8c7c02c571ada78d
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjrosenb
bugs996883
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Land bug 996883. r=mjrosenb
js/src/jit/arm/MacroAssembler-arm.cpp
--- a/js/src/jit/arm/MacroAssembler-arm.cpp
+++ b/js/src/jit/arm/MacroAssembler-arm.cpp
@@ -360,17 +360,17 @@ MacroAssemblerARM::ma_alu(Register src1,
     // and add{,s} dest, src, 0xff00; add{,s} dest, dest, 0xff is not
     // guaranteed to set the overflow flag the same as the (theoretical)
     // one instruction variant.
     if (alu_dbl(src1, imm, dest, op, sc, c))
         return;
 
     // And try with its negative.
     if (negOp != op_invalid &&
-        alu_dbl(src1, negImm, dest, negOp, sc, c))
+        alu_dbl(src1, negImm, negDest, negOp, sc, c))
         return;
 
     // Well, damn. We can use two 16 bit mov's, then do the op
     // or we can do a single load from a pool then op.
     if (hasMOVWT()) {
         // Try to load the immediate into a scratch register
         // then use that
         as_movw(ScratchRegister, imm.value & 0xffff, c);