Skip to content

[wasm2c] Fix exception testing on macOS #2716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 4 commits into from
Mar 18, 2026
+20 −8
Merged

[wasm2c] Fix exception testing on macOS #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d012a98
Fix wasm2c exception testing on macOS
kevmoo Mar 14, 2026
4f133d2
a bit more context
kevmoo Mar 14, 2026
b2f2703
make the mac bits a bit more consistent
kevmoo Mar 14, 2026
7c273de
smaller note
kevmoo Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
# Temporarily replaced macos-latest with macos-14.
# See https://github.com/WebAssembly/wabt/issues/2654
os: [ubuntu-latest, macos-14, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/setup-python@v5
with:
Expand All @@ -45,7 +43,7 @@ jobs:
if: matrix.os == 'ubuntu-latest'
- name: install ninja (osx)
run: brew install ninja
if: startsWith(matrix.os, 'macos-')
if: matrix.os == 'macos-latest'
- name: install ninja (win)
run: choco install ninja
if: matrix.os == 'windows-latest'
Expand Down
22 changes: 18 additions & 4 deletions wasm2c/wasm-rt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,13 +572,27 @@ typedef struct {
} wasm_rt_jmp_buf;

#ifndef _WIN32
#define WASM_RT_SETJMP_SETBUF(buf) sigsetjmp(buf, 1)
#define WASM_RT_SETJMP_TRAP_SETBUF(buf) sigsetjmp(buf, 1)

/**
* On macOS XNU, there is a bug where nested `sigsetjmp` and `siglongjmp`
* across threads that have an allocated alternate signal stack (`SS_ONSTACK`)
* will erroneously cause the kernel to preserve the `SS_ONSTACK` flag in the
* thread state
*
* See: https://github.com/WebAssembly/wabt/issues/2654
* See: https://github.com/golang/go/issues/44501
*/
#define WASM_RT_SETJMP_EXN_SETBUF(buf) sigsetjmp(buf, 0)
#else
#define WASM_RT_SETJMP_SETBUF(buf) setjmp(buf)
#define WASM_RT_SETJMP_TRAP_SETBUF(buf) setjmp(buf)
#define WASM_RT_SETJMP_EXN_SETBUF(buf) setjmp(buf)
#endif

#define WASM_RT_SETJMP(buf) \
((buf).initialized = true, WASM_RT_SETJMP_SETBUF((buf).buffer))
((buf).initialized = true, WASM_RT_SETJMP_TRAP_SETBUF((buf).buffer))
#define WASM_RT_SETJMP_EXN(buf) \
((buf).initialized = true, WASM_RT_SETJMP_EXN_SETBUF((buf).buffer))

#ifndef _WIN32
#define WASM_RT_LONGJMP_UNCHECKED(buf, val) siglongjmp(buf, val)
Expand All @@ -604,7 +618,7 @@ WASM_RT_NO_RETURN void wasm_rt_trap(wasm_rt_trap_t);
/** Return a human readable error string based on a trap type. */
const char* wasm_rt_strerror(wasm_rt_trap_t trap);

#define wasm_rt_try(target) WASM_RT_SETJMP(target)
#define wasm_rt_try(target) WASM_RT_SETJMP_EXN(target)

/** WebAssembly's default page size (64 KiB) */
#define WASM_DEFAULT_PAGE_SIZE 65536
Expand Down
Loading