Skip to content

wasm-merge: Validate at the very end #7962

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
kripken merged 2 commits into from
Oct 9, 2025
Merged

wasm-merge: Validate at the very end #7962

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b1890a
wasm-merge: Validate at the very end
kripken Oct 9, 2025
6e09d33
Merge remote-tracking branch 'origin/main' into merge.lastv
kripken Oct 9, 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
15 changes: 7 additions & 8 deletions src/tools/wasm-merge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,14 +778,6 @@ Input source maps can be specified by adding an -ism option right after the modu
}
}

// If we didn't validate after each merged module, validate once at the very
// end. This won't catch problems at the earliest point, but is still useful.
if (!PassRunner::getPassDebug() && options.passOptions.validate &&
!WasmValidator().validate(merged)) {
std::cout << merged << '\n';
Fatal() << "error in validating final merged";
}

// Fuse imports and exports now that everything is all together in the merged
// module.
fuseImportsAndExports(options.passOptions);
Expand All @@ -808,6 +800,13 @@ Input source maps can be specified by adding an -ism option right after the modu
passRunner.run();
}

// Without pass-debug mode, validate once at the very end.
if (!PassRunner::getPassDebug() && options.passOptions.validate &&
!WasmValidator().validate(merged)) {
std::cout << merged << '\n';
Fatal() << "error in validating final merged";
}

// Output.
if (options.extra.count("output") > 0) {
ModuleWriter writer(options.passOptions);
Expand Down
Loading