Skip to content

gh-128627: Skip wasm-gc on iOS Safari where it's broken #130418

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
merged 3 commits into from
Feb 23, 2025
Merged

gh-128627: Skip wasm-gc on iOS Safari where it's broken #130418

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0da9a0c
gh-128627: Skip wasm-gc on iOS Safari where it's broken
ambv Feb 21, 2025
0c2b94e
Don't skip count-args-pointer generation
ambv Feb 23, 2025
2d706e6
Don't use navigator if it doesn't exist (hi, Node)
ambv Feb 23, 2025
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
16 changes: 13 additions & 3 deletions Python/emscripten_trampoline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ EM_JS(CountArgsFunc, _PyEM_GetCountArgsPtr, (), {
// i32.const -1
// )
// )
addOnPreRun(() => {

function getPyEMCountArgsPtr() {
let isIOS = globalThis.navigator && /iPad|iPhone|iPod/.test(navigator.platform);
if (isIOS) {
return 0;
}

// Try to initialize countArgsFunc
const code = new Uint8Array([
0x00, 0x61, 0x73, 0x6d, // \0asm magic number
Expand Down Expand Up @@ -149,15 +155,19 @@ addOnPreRun(() => {
0x41, 0x7f, // i32.const -1
0x0b // end function
]);
let ptr = 0;
try {
const mod = new WebAssembly.Module(code);
const inst = new WebAssembly.Instance(mod, { e: { t: wasmTable } });
ptr = addFunction(inst.exports.f);
return addFunction(inst.exports.f);
} catch (e) {
// If something goes wrong, we'll null out _PyEM_CountFuncParams and fall
// back to the JS trampoline.
return 0;
}
}

addOnPreRun(() => {
const ptr = getPyEMCountArgsPtr();
Module._PyEM_CountArgsPtr = ptr;
const offset = HEAP32[__PyEM_EMSCRIPTEN_COUNT_ARGS_OFFSET / 4];
HEAP32[(__PyRuntime + offset) / 4] = ptr;
Expand Down
Loading