Fix ARM-only typo in nanojit merge (NB: NOT being simultaneously merged to nanojit-central out of expediency). r=sparky
authorJeff Walden <jwalden@mit.edu>
Mon, 22 Mar 2010 11:48:22 -0700
changeset 40328 806dfb7f713db7ec264caa2d616382e86cc5cdcd
parent 40327 ff6b54ac276de71f3d73801431a001657af421e3
child 40329 c9e8ef81e7f4e244fde458356925fac145d7015e
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssparky
milestone1.9.3a3pre
Fix ARM-only typo in nanojit merge (NB: NOT being simultaneously merged to nanojit-central out of expediency). r=sparky
js/src/nanojit/NativeARM.cpp
--- a/js/src/nanojit/NativeARM.cpp
+++ b/js/src/nanojit/NativeARM.cpp
@@ -858,17 +858,17 @@ Assembler::asm_call(LInsp ins)
     NanoAssert(_config.arm_vfp || ins->isop(LIR_icall));
 
     // If we're using VFP, and the return type is a double, it'll come back in
     // R0/R1. We need to either place it in the result fp reg, or store it.
     // See comments above for more details as to why this is necessary here
     // for floating point calls, but not for integer calls.
     if (_config.arm_vfp && ins->isUsed()) {
         // Determine the size (and type) of the instruction result.
-        ArgType rsize = (ArgType)(ci->_typesig & ARGTYPE_MASK_ANY);
+        ArgType rsize = (ArgType)(ci->_typesig & ARGTYPE_MASK);
 
         // If the result size is a floating-point value, treat the result
         // specially, as described previously.
         if (ci->returnType() == ARGTYPE_F) {
             Register rr = ins->deprecated_getReg();
 
             NanoAssert(ins->opcode() == LIR_fcall);