Backed out 4 changesets (bug 1549667) for missing reviewers. CLOSED TREE

Backed out changeset b0a2912f83a9 (bug 1549667)
Backed out changeset acf19aefc4d2 (bug 1549667)
Backed out changeset 5d580fa5d753 (bug 1549667)
Backed out changeset b661a2bf1626 (bug 1549667)

js/src/builtin/TestingFunctions.cpp

@@ -255,24 +255,6 @@ static bool GetBuildConfiguration(JSContext* cx, unsigned argc, Value* vp) {
     return false;
   }
 
-#ifdef JS_CODEGEN_MIPS32
-  value = BooleanValue(true);
-#else
-  value = BooleanValue(false);
-#endif
-  if (!JS_SetProperty(cx, info, "mips32", value)) {
-    return false;
-  }
-
-#ifdef JS_CODEGEN_MIPS64
-  value = BooleanValue(true);
-#else
-  value = BooleanValue(false);
-#endif
-  if (!JS_SetProperty(cx, info, "mips64", value)) {
-    return false;
-  }
-
 #ifdef JS_SIMULATOR_MIPS32
   value = BooleanValue(true);
 #else

js/src/jit-test/tests/ion/bug1433496.js

@@ -1,4 +1,4 @@
-// |jit-test| --spectre-mitigations=on; skip-if: getBuildConfiguration()['mips32'] || getBuildConfiguration()['mips64']
+// |jit-test| --spectre-mitigations=on
 function f() {
     return arguments[arguments.length];
 }

js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h

@@ -787,27 +787,18 @@ void MacroAssembler::branchToComputedAddress(const BaseIndex& addr) {
 
 void MacroAssembler::cmp32Move32(Condition cond, Register lhs, Register rhs,
                                  Register src, Register dest) {
-  Register scratch = ScratchRegister;
-  MOZ_ASSERT(src != scratch && dest != scratch);
-  cmp32Set(cond, lhs, rhs, scratch);
-  as_movn(dest, src, scratch);
+  MOZ_CRASH();
 }
 
 void MacroAssembler::cmp32MovePtr(Condition cond, Register lhs, Imm32 rhs,
                                   Register src, Register dest) {
-  Register scratch = ScratchRegister;
-  MOZ_ASSERT(src != scratch && dest != scratch);
-  cmp32Set(cond, lhs, rhs, scratch);
-  as_movn(dest, src, scratch);
+  MOZ_CRASH();
 }
 
 void MacroAssembler::cmp32Move32(Condition cond, Register lhs,
                                  const Address& rhs, Register src,
                                  Register dest) {
-  SecondScratchRegisterScope scratch2(*this);
-  MOZ_ASSERT(lhs != scratch2 && src != scratch2 && dest != scratch2);
-  load32(rhs, scratch2);
-  cmp32Move32(cond, lhs, scratch2, src, dest);
+  MOZ_CRASH();
 }
 
 void MacroAssembler::cmp32Load32(Condition cond, Register lhs,

js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp

@@ -496,7 +496,7 @@ void MacroAssemblerMIPSShared::ma_load_unaligned(
   BufferOffset load;
   switch (size) {
     case SizeHalfWord:
-      if (extension == ZeroExtend) {
+      if (extension != ZeroExtend) {
         load = as_lbu(temp, base, hiOffset);
       } else {
         load = as_lb(temp, base, hiOffset);
@@ -508,7 +508,7 @@ void MacroAssemblerMIPSShared::ma_load_unaligned(
       load = as_lwl(dest, base, hiOffset);
       as_lwr(dest, base, lowOffset);
 #ifdef JS_CODEGEN_MIPS64
-      if (extension == ZeroExtend) {
+      if (extension != ZeroExtend) {
         as_dext(dest, dest, 0, 32);
       }
 #endif

js/src/jit/mips64/CodeGenerator-mips64.cpp

@@ -80,7 +80,6 @@ void CodeGenerator::visitUnbox(LUnbox* unbox) {
         break;
       case MIRType::BigInt:
         masm.unboxBigInt(inputReg, result);
-        break;
       default:
         MOZ_CRASH("Given MIRType cannot be unboxed.");
     }
@@ -106,7 +105,6 @@ void CodeGenerator::visitUnbox(LUnbox* unbox) {
       break;
     case MIRType::BigInt:
       masm.unboxBigInt(inputAddr, result);
-      break;
     default:
       MOZ_CRASH("Given MIRType cannot be unboxed.");
   }