Poor winmo neglect killed the build
authorRick Reitmaier <rreitmai@adobe.com>
Thu, 28 Oct 2010 18:12:54 -0700
changeset 57695 2b77342e96dd89e2c5b2294a682d4d5ad88355f4
parent 57694 a23a09d2a9b6758e9ee3365e640c2afce219ebdc
child 57696 104e20381ef1c09ded64ce4eeb3fcdb00d9c8796
push id17032
push userrsayre@mozilla.com
push dateWed, 17 Nov 2010 21:55:39 +0000
treeherdermozilla-central@78a42f77bb90 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b8pre
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
Poor winmo neglect killed the build
js/src/nanojit/NativeARM.cpp
--- a/js/src/nanojit/NativeARM.cpp
+++ b/js/src/nanojit/NativeARM.cpp
@@ -703,17 +703,17 @@ Assembler::asm_arg_64(LIns* arg, Paramet
             Register dm = findRegFor(arg, FpRegs);
             FMRRD(ra, rb, dm);
         } else {
             asm_regarg(ARGTYPE_I, arg->oprnd1(), ra);
             asm_regarg(ARGTYPE_I, arg->oprnd2(), rb);
         }
 
 #ifndef NJ_ARM_EABI
-    } else if (r == R3) {
+    } else if (params.r == R3) {
         // We only have one register left, but the legacy ABI requires that we
         // put 32 bits of the argument in the register (R3) and the remaining
         // 32 bits on the stack.
         Register    ra = params.r; // R3
         params.r = R4;
 
         // We're splitting the argument between registers and the stack.  This
         // must be the first time that the stack is used, so stkd must be at 0.