Skip to content

jsifier.js: Move __proxy handling so it happens before wasm64 wrapping #18707

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 1 commit into from
Feb 10, 2023
Merged

jsifier.js: Move __proxy handling so it happens before wasm64 wrapping #18707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 28 additions & 30 deletions src/jsifier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,33 @@ function ${name}(${args}) {
}`);
}

if (SHARED_MEMORY) {
Copy link
Member

@kripken kripken Feb 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before this was in a check isFunction while now it isn't I think? That's probably fine as only functions can be proxied. Maybe worth an assertion though?

Copy link
Collaborator Author

@sbc100 sbc100 Feb 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This whole code block is now inside of processLibraryFunction which is only ever called on functions.

const proxyingMode = LibraryManager.library[symbol + '__proxy'];
if (proxyingMode) {
if (proxyingMode !== 'sync' && proxyingMode !== 'async') {
throw new Error(`Invalid proxyingMode ${symbol}__proxy: '${proxyingMode}' specified!`);
}
const sync = proxyingMode === 'sync';
if (USE_PTHREADS) {
snippet = modifyFunction(snippet, (name, args, body) => `
function ${name}(${args}) {
if (ENVIRONMENT_IS_PTHREAD)
return _emscripten_proxy_to_main_thread_js(${proxiedFunctionTable.length}, ${+sync}${args ? ', ' : ''}${args});
${body}
}\n`);
} else if (WASM_WORKERS && ASSERTIONS) {
// In ASSERTIONS builds add runtime checks that proxied functions are not attempted to be called in Wasm Workers
// (since there is no automatic proxying architecture available)
snippet = modifyFunction(snippet, (name, args, body) => `
function ${name}(${args}) {
assert(!ENVIRONMENT_IS_WASM_WORKER, "Attempted to call proxied function '${name}' in a Wasm Worker, but in Wasm Worker enabled builds, proxied function architecture is not available!");
${body}
}\n`);
}
proxiedFunctionTable.push(mangled);
}
}

if (MEMORY64) {
const sig = LibraryManager.library[symbol + '__sig'];
if (sig && sig.includes('p')) {
Expand Down Expand Up @@ -362,36 +389,7 @@ function ${name}(${args}) {
let contentText;
if (isFunction) {
// Emit the body of a JS library function.
const proxyingMode = LibraryManager.library[symbol + '__proxy'];
if (SHARED_MEMORY && proxyingMode) {
if (proxyingMode !== 'sync' && proxyingMode !== 'async') {
throw new Error(`Invalid proxyingMode ${symbol}__proxy: '${proxyingMode}' specified!`);
}
const sync = proxyingMode === 'sync';
assert(typeof original == 'function');
if (USE_PTHREADS) {
contentText = modifyFunction(snippet, (name, args, body) => `
function ${name}(${args}) {
if (ENVIRONMENT_IS_PTHREAD)
return _emscripten_proxy_to_main_thread_js(${proxiedFunctionTable.length}, ${+sync}${args ? ', ' : ''}${args});
${body}
}\n`);
} else if (WASM_WORKERS) {
if (ASSERTIONS) {
// In ASSERTIONS builds add runtime checks that proxied functions are not attempted to be called in Wasm Workers
// (since there is no automatic proxying architecture available)
contentText = modifyFunction(snippet, (name, args, body) => `
function ${name}(${args}) {
assert(!ENVIRONMENT_IS_WASM_WORKER, "Attempted to call proxied function '${name}' in a Wasm Worker, but in Wasm Worker enabled builds, proxied function architecture is not available!");
${body}
}\n`);
} else {
// In non-ASSERTIONS builds directly emit the original function.
contentText = snippet;
}
}
proxiedFunctionTable.push(mangled);
} else if ((USE_ASAN || USE_LSAN || UBSAN_RUNTIME) && LibraryManager.library[symbol + '__noleakcheck']) {
if ((USE_ASAN || USE_LSAN || UBSAN_RUNTIME) && LibraryManager.library[symbol + '__noleakcheck']) {
contentText = modifyFunction(snippet, (name, args, body) => `
function ${name}(${args}) {
return withBuiltinMalloc(function() {
Expand Down