Backed out 4 changesets (bug 1549667) for missing reviewers. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Fri, 10 May 2019 09:56:29 +0300
changeset 532171 d4a9de6a57b71939eb1b155a14de17c58387f226
parent 532170 47d40e2693bd341147547867b9458a603a7e9bd7
child 532172 9321de8191813e81fcfd2a9c02d1faa90cebdaa5
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1549667
milestone68.0a1
backs outb0a2912f83a9bc268e8f1f0185608d1ccee22b55
acf19aefc4d23947c202b2eaf445b7ef332d7777
5d580fa5d7531f846acac842f7c9eec92a52a460
b661a2bf1626fcf9cef6915dffbff50a6c6dc289
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
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
js/src/jit-test/tests/ion/bug1433496.js
js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
js/src/jit/mips64/CodeGenerator-mips64.cpp
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -250,34 +250,16 @@ static bool GetBuildConfiguration(JSCont
   value = BooleanValue(true);
 #else
   value = BooleanValue(false);
 #endif
   if (!JS_SetProperty(cx, info, "arm64-simulator", value)) {
     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
   value = BooleanValue(false);
 #endif
   if (!JS_SetProperty(cx, info, "mips32-simulator", value)) {
     return false;
   }
--- a/js/src/jit-test/tests/ion/bug1433496.js
+++ b/js/src/jit-test/tests/ion/bug1433496.js
@@ -1,6 +1,6 @@
-// |jit-test| --spectre-mitigations=on; skip-if: getBuildConfiguration()['mips32'] || getBuildConfiguration()['mips64']
+// |jit-test| --spectre-mitigations=on
 function f() {
     return arguments[arguments.length];
 }
 for (var i = 0; i < 10; i++)
     assertEq(f(), undefined);
--- a/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
+++ b/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
@@ -782,37 +782,28 @@ void MacroAssembler::branchTestMagic(Con
 
 void MacroAssembler::branchToComputedAddress(const BaseIndex& addr) {
   loadPtr(addr, ScratchRegister);
   branch(ScratchRegister);
 }
 
 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,
                                  const Address& rhs, const Address& src,
                                  Register dest) {
   // This is never used, but must be present to facilitate linking on mips(64).
   MOZ_CRASH("No known use cases");
 }
--- a/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
+++ b/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp
@@ -491,29 +491,29 @@ void MacroAssemblerMIPSShared::ma_load_u
     base = ScratchRegister;
     lowOffset = Imm16(0).encode();
     hiOffset = Imm16(size / 8 - 1).encode();
   }
 
   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);
       }
       as_lbu(dest, base, lowOffset);
       ma_ins(dest, temp, 8, 24);
       break;
     case SizeWord:
       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
       break;
 #ifdef JS_CODEGEN_MIPS64
     case SizeDouble:
       load = as_ldl(dest, base, hiOffset);
       as_ldr(dest, base, lowOffset);
--- a/js/src/jit/mips64/CodeGenerator-mips64.cpp
+++ b/js/src/jit/mips64/CodeGenerator-mips64.cpp
@@ -75,17 +75,16 @@ void CodeGenerator::visitUnbox(LUnbox* u
       case MIRType::String:
         masm.unboxString(inputReg, result);
         break;
       case MIRType::Symbol:
         masm.unboxSymbol(inputReg, result);
         break;
       case MIRType::BigInt:
         masm.unboxBigInt(inputReg, result);
-        break;
       default:
         MOZ_CRASH("Given MIRType cannot be unboxed.");
     }
     return;
   }
 
   Address inputAddr = ToAddress(input);
   switch (mir->type()) {
@@ -101,17 +100,16 @@ void CodeGenerator::visitUnbox(LUnbox* u
     case MIRType::String:
       masm.unboxString(inputAddr, result);
       break;
     case MIRType::Symbol:
       masm.unboxSymbol(inputAddr, result);
       break;
     case MIRType::BigInt:
       masm.unboxBigInt(inputAddr, result);
-      break;
     default:
       MOZ_CRASH("Given MIRType cannot be unboxed.");
   }
 }
 
 void CodeGeneratorMIPS64::splitTagForTest(const ValueOperand& value,
                                           ScratchTagScope& tag) {
   masm.splitTag(value.valueReg(), tag);