Bug 587962 - [JAEGER] JaegerMonkey build and check failed on Solaris x86 with Sun Studio 12. r=dvander.
authorLeon Sha <leon.sha@sun.com>
Tue, 07 Sep 2010 12:48:57 +0800
changeset 74568 5492e0774e89b6f960847d1c5307c99164141501
parent 74567 ca32ed513371555a77ee4ecad6e4987310d10d1a
child 74569 cc923f1f25bd9c710e1ef26c07205918be51b1bb
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewersdvander
bugs587962
milestone2.0b6pre
Bug 587962 - [JAEGER] JaegerMonkey build and check failed on Solaris x86 with Sun Studio 12. r=dvander.
js/src/methodjit/Compiler.cpp
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -1866,16 +1866,19 @@ mjit::Compiler::emitUncachedCall(uint32 
     masm.move(Imm32(argc), Registers::ArgReg1);
     stubCall(stub);
     ADD_CALLSITE(false);
 
     Jump notCompiled = masm.branchTestPtr(Assembler::Zero, r0, r0);
     stubcc.linkExitDirect(notCompiled, stubcc.masm.label());
 
     masm.call(r0);
+#if defined(JS_NO_FASTCALL) && defined(JS_CPU_X86)
+    masm.callLabel = masm.label();
+#endif
     ADD_CALLSITE(false);
 
     if (callingNew)
         emitPrimitiveTestForNew(argc);
 
     frame.popn(argc + 2);
     frame.takeReg(JSReturnReg_Type);
     frame.takeReg(JSReturnReg_Data);