Bug 1140801 - Don't invoke functions on non-ion platforms. r=nbp
authorSteve Singer <steve@ssinger.info>
Sat, 07 Mar 2015 21:13:00 +0100
changeset 261588 132344b49ba6ddb63998e919af682fc1675c733d
parent 261587 ce40549140aba20e47b57eaff5fb8a95767109be
child 261589 622f0877bc3f14f68e50fabbe7e7c3df0ff5f46c
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs1140801
milestone39.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 1140801 - Don't invoke functions on non-ion platforms. r=nbp
js/src/asmjs/AsmJSValidate.cpp
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -8198,16 +8198,18 @@ static const FloatRegisterSet NonVolatil
                                                                  : FloatRegisterSet();
 
 #if defined(JS_CODEGEN_MIPS)
 // Mips is using one more double slot due to stack alignment for double values.
 // Look at MacroAssembler::PushRegsInMask(RegisterSet set)
 static const unsigned FramePushedAfterSave = NonVolatileRegs.gprs().size() * sizeof(intptr_t) +
                                              NonVolatileRegs.fpus().getPushSizeInBytes() +
                                              sizeof(double);
+#elif defined(JS_CODEGEN_NONE)
+static const unsigned FramePushedAfterSave = 0;
 #else
 static const unsigned FramePushedAfterSave =
    SupportsSimd ? NonVolatileRegs.gprs().size() * sizeof(intptr_t) +
                   NonVolatileRegs.fpus().size() * Simd128DataSize
                 : NonVolatileRegs.gprs().size() * sizeof(intptr_t) +
                   NonVolatileRegs.fpus().getPushSizeInBytes();
 #endif
 static const unsigned FramePushedForEntrySP = FramePushedAfterSave + sizeof(void*);