Bug 1250031 - IonMonkey: MIPS: Fix ion/bug1233343.js crash. r=h4writer
authorHeiher <r@hev.cc>
Mon, 29 Feb 2016 17:20:18 +0800
changeset 322403 b1806f5f3b8155a670f95a6e7f45d0cb4a044462
parent 322402 f09fc69822a53c51075d0025c65732b3342525a8
child 322404 ea315d62656857d0e16cfde598ba14028813f2fc
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs1250031, 1233343
milestone47.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 1250031 - IonMonkey: MIPS: Fix ion/bug1233343.js crash. r=h4writer --- js/src/jit/SharedIC.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
js/src/jit/SharedIC.cpp
--- a/js/src/jit/SharedIC.cpp
+++ b/js/src/jit/SharedIC.cpp
@@ -727,17 +727,18 @@ ICStubCompiler::getStubCode()
     uint32_t stubKey = getKey();
     JitCode* stubCode = comp->getStubCode(stubKey);
     if (stubCode)
         return stubCode;
 
     // Compile new stubcode.
     JitContext jctx(cx, nullptr);
     MacroAssembler masm;
-#ifndef JS_USE_LINK_REGISTER
+#if !defined(JS_USE_LINK_REGISTER) && \
+    !(defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64))
     // The first value contains the return addres,
     // which we pull into ICTailCallReg for tail calls.
     masm.adjustFrame(sizeof(intptr_t));
 #endif
 #ifdef JS_CODEGEN_ARM
     masm.setSecondScratchReg(BaselineSecondScratchReg);
 #endif