Skip to content

Link wasm-wasm directly in the fuzzer #8794

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

Open
kripken wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Link wasm-wasm directly in the fuzzer #8794

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
11 changes: 9 additions & 2 deletions scripts/fuzz_shell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ function logRef(ref) {
// whose keys are strings and whose values are the corresponding exports).
var exports = {};

// The raw exports, uninstrumented by JSPI. This is necessary as we need the
// JSPI wrapping when calling from JS, but when calling from wasm, the exports
// need to be linked to imports directly, in the raw form.
var rawExports = {};

// Also track exports in a list, to allow access by index. Each entry here will
// be in the form of { name: .., value: .. }. That allows us to log the name of
// the function and also to call it. This is important because different
Expand Down Expand Up @@ -512,8 +517,9 @@ function build(binary, isSecond) {

if (isSecond) {
assert(secondBinary);
// Provide the primary module's exports to the secondary.
imports['primary'] = exports;
// Provide the primary module's exports to the secondary. This is a direct
// wasm-wasm link, so we use the raw exports.
imports['primary'] = rawExports;
}

var instance;
Expand Down Expand Up @@ -547,6 +553,7 @@ function build(binary, isSecond) {
for (var e of WebAssembly.Module.exports(module)) {
var key = e.name;
var value = instance.exports[key];
rawExports[key] = value;
value = wrapExportForJSPI(value);
exports[key] = value;

Expand Down
Loading