[tbb-commits] [tor-browser] 46/76: Bug 1687417 - Disable static_assert on NOJIT 32-bit. r=jseward, a=RyanVM

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-91.8.0esr-11.0-1
in repository tor-browser.

commit d7c70a67c9c5d9dd70e70f4563d92c0e9a9f5e6d
Author: Lars T Hansen <lhansen at mozilla.com>
AuthorDate: Mon Mar 21 08:14:32 2022 +0000

    Bug 1687417 - Disable static_assert on NOJIT 32-bit. r=jseward, a=RyanVM
    
    Backport for ESR91, see original patch for more discussion.
    
    Differential Revision: https://phabricator.services.mozilla.com/D141572
---
 js/src/wasm/WasmFrame.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/src/wasm/WasmFrame.cpp b/js/src/wasm/WasmFrame.cpp
index 9a1de91b4a502..495f3bf0bc51d 100644
--- a/js/src/wasm/WasmFrame.cpp
+++ b/js/src/wasm/WasmFrame.cpp
@@ -54,8 +54,10 @@ void DebugFrame::alignmentStaticAsserts() {
 
   static_assert(WasmStackAlignment >= Alignment,
                 "Aligned by ABI before pushing DebugFrame");
+#ifndef JS_CODEGEN_NONE
   static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0,
                 "Aligned after pushing DebugFrame");
+#endif
 #ifdef JS_CODEGEN_ARM64
   // This constraint may or may not be necessary.  If you hit this because
   // you've changed the frame size then feel free to remove it, but be extra

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.