Bug 1399060 - MIPS[64]: Fix simulator build failures. r=bbouvier
authorMiran.Karic <Miran.Karic@imgtec.com>
Tue, 12 Sep 2017 03:37:00 -0400
changeset 429808 c439271f94d7a8cb1e314f2134d97150b5d0dac6
parent 429807 644d9742cf75fecc073c6f13553c7806cfe48ffb
child 429809 a8d001a6ee41840e38414a313579a2b0c2799300
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbouvier
bugs1399060
milestone57.0a1
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
Bug 1399060 - MIPS[64]: Fix simulator build failures. r=bbouvier MIPS simulator build started failing recently. Also a recent change caused build failure in MIPS64. This fixes both problems.
js/src/jit/mips64/CodeGenerator-mips64.cpp
js/src/jsapi-tests/testPrintf.cpp
--- a/js/src/jit/mips64/CodeGenerator-mips64.cpp
+++ b/js/src/jit/mips64/CodeGenerator-mips64.cpp
@@ -601,17 +601,17 @@ CodeGeneratorMIPS64::visitWrapInt64ToInt
         else
             masm.ma_sll(output, ToRegister(input), Imm32(0));
     } else {
         MOZ_CRASH("Not implemented.");
     }
 }
 
 void
-CodeGeneratorMIPS::visitSignExtendInt64(LSignExtendInt64* lir)
+CodeGeneratorMIPS64::visitSignExtendInt64(LSignExtendInt64* lir)
 {
     Register64 input = ToRegister64(lir->getInt64Operand(0));
     Register64 output = ToOutRegister64(lir);
     switch (lir->mode()) {
       case MSignExtendInt64::Byte:
         masm.move8SignExtend(input.reg, output.reg);
         break;
       case MSignExtendInt64::Half:
--- a/js/src/jsapi-tests/testPrintf.cpp
+++ b/js/src/jsapi-tests/testPrintf.cpp
@@ -47,17 +47,17 @@ BEGIN_TEST(testPrintf)
     if (sizeof(short) == 2) {
         CHECK(print_one("8000", "%hx", (unsigned short) 0x8000));
     }
     CHECK(print_one("0xf0f0", "0x%lx", 0xf0f0ul));
     CHECK(print_one("0xF0F0", "0x%llX", 0xf0f0ull));
     CHECK(print_one("27270", "%zu", (size_t) 27270));
     CHECK(print_one("27270", "%zu", (size_t) 27270));
     CHECK(print_one("hello", "he%so", "ll"));
-    CHECK(print_one("(null)", "%s", zero()));
+    CHECK(print_one("(null)", "%s", ::zero()));
     CHECK(print_one("0", "%p", (char *) 0));
     CHECK(print_one("h", "%c", 'h'));
     CHECK(print_one("1.500000", "%f", 1.5f));
     CHECK(print_one("1.5", "%g", 1.5));
 
     // Regression test for bug#1350097.  The bug was an assertion
     // failure caused by printing a very long floating point value.
     print_one("ignore", "%lf", DBL_MAX);