Backed out changeset 5a71ed072a2b (bug 1300546) for android failures in test_bug772796.html a=backout CLOSED TREE

js/src/jit-test/tests/wasm/regress/bug1300546.js

@@ -1,34 +0,0 @@
-load(libdir + "wasm.js");
-
-setJitCompilerOption('wasm.test-mode', 1);
-
-try {
-    wasmEvalText(`
-
-    (module
-      (type $type0 (func))
-      (func $func0
-          (nop)
-          (f64.load offset=59 align=1 (i32.const 0))
-          (current_memory)
-          (current_memory)
-          (current_memory)
-          (current_memory)
-          (current_memory)
-          (current_memory)
-          (current_memory)
-          (current_memory)
-          (i64.rem_s (i64.const 17) (i64.xor (i64.const 17) (i64.xor (i64.const 17) (i64.xor (i64.xor (i64.const 17) (i64.const 17)) (i64.xor (i64.const 17) (i64.const 17))))))
-
-         (i64.rem_s
-          (i64.const 17)
-          (i64.xor
-            (i64.rem_s (i64.const 17) (i64.const 17))
-            (i64.xor (i64.rem_s (i64.const 17) (i64.const 17)) (i64.xor (i64.const 17) (i64.const 17)))))
-      )
-      (memory 1 1)
-    )
-
-    `)(createI64(41));
-} catch(e) {
-}

js/src/jit/arm/Lowering-arm.cpp

@@ -203,7 +203,8 @@ LIRGeneratorARM::lowerForALUInt64(LInstructionHelper<INT64_PIECES, 2 * INT64_PIE
                                   MDefinition* mir, MDefinition* lhs, MDefinition* rhs)
 {
     ins->setInt64Operand(0, useInt64RegisterAtStart(lhs));
-    ins->setInt64Operand(INT64_PIECES, useInt64OrConstant(rhs));
+    ins->setInt64Operand(INT64_PIECES,
+                         lhs != rhs ? useInt64OrConstant(rhs) : useInt64OrConstantAtStart(rhs));
     defineInt64ReuseInput(ins, mir, 0);
 }
 

js/src/jit/x86/Lowering-x86.cpp

@@ -209,7 +209,8 @@ LIRGeneratorX86::lowerForALUInt64(LInstructionHelper<INT64_PIECES, 2 * INT64_PIE
                                   MDefinition* mir, MDefinition* lhs, MDefinition* rhs)
 {
     ins->setInt64Operand(0, useInt64RegisterAtStart(lhs));
-    ins->setInt64Operand(INT64_PIECES, useInt64OrConstant(rhs));
+    ins->setInt64Operand(INT64_PIECES,
+                         lhs != rhs ? useInt64OrConstant(rhs) : useInt64OrConstantAtStart(rhs));
     defineInt64ReuseInput(ins, mir, 0);
 }