1*4882a593SmuzhiyunFix build when JIT is disabled on 32bit systems 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunThis fixes a compile time assert 4*4882a593Smuzhiyunjs/src/wasm/WasmFrame.cpp:57:3: error: static_assert failed due to requirement '(__builtin_offsetof(js::wasm::DebugFrame, frame_) + sizeof(js::wasm::Frame)) % Alignment == 0' "Aligned after pushing DebugFrame" 5*4882a593Smuzhiyun static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, 6*4882a593Smuzhiyun ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Pending 9*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun--- a/js/src/wasm/WasmFrame.h 12*4882a593Smuzhiyun+++ b/js/src/wasm/WasmFrame.h 13*4882a593Smuzhiyun@@ -230,6 +230,8 @@ class DebugFrame { 14*4882a593Smuzhiyun // Avoid -Wunused-private-field warnings. 15*4882a593Smuzhiyun protected: 16*4882a593Smuzhiyun #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ 17*4882a593Smuzhiyun+ (defined(JS_CODEGEN_NONE) && \ 18*4882a593Smuzhiyun+ (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ 19*4882a593Smuzhiyun defined(JS_CODEGEN_X86) || defined(__wasi__) 20*4882a593Smuzhiyun // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only 21*4882a593Smuzhiyun // 4-byte aligned, so we add another word to get up to 8-byte 22