wasm2c: reject contradictory imports instead of aborting - #2813
Merged
shravanrn merged 4 commits intoAug 18, 2026
Merged
Conversation
sbc100
approved these changes
Aug 8, 2026
Member
|
Seems reasonable to me |
shravanrn
requested changes
Aug 16, 2026
shravanrn
requested changes
Aug 17, 2026
Contributor
Author
|
@shravanrn I have removed the WriteModule preflight and kept a single ComputeUniqueImports() in BeginInstance(). On failure it now sets result_ and returns, with Failed(result_) checks in WriteModuleInstance, WriteCHeader, and WriteModule so we don't keep emitting after an error. |
shravanrn
approved these changes
Aug 17, 2026
Collaborator
|
@ANAMASGARD Feel free to rebase and land. (Let me know if you need me to click the land button) |
Preflight ComputeUniqueImports() before codegen and return Result::Error when the same module/field name is imported with different external kinds, instead of hitting UNIMPLEMENTED/abort on valid-but-unlinkable modules. Fixes WebAssembly#2751 Signed-off-by: Gaurav Chaudhary <chaudharygaurav2004@gmail.com>
Clear import accumulators at the start of ComputeUniqueImports() so it can run from both WriteModule() preflight and BeginInstance(). Keeps early rejection of contradictory imports while making the unique_imports_ dependency explicit at the point of use. Fixes WebAssembly#2751 Signed-off-by: Gaurav Chaudhary <chaudharygaurav2004@gmail.com>
Remove duplicate ComputeUniqueImports() from WriteModule(). Keep one call in BeginInstance(), set result_ on failure, and stop emission in WriteModuleInstance, WriteCHeader, and WriteModule when result_ is Error. Fixes WebAssembly#2751 Signed-off-by: Gaurav Chaudhary <chaudharygaurav2004@gmail.com>
Single call site in BeginInstance() no longer needs accumulator clears added for the earlier dual-call approach. Fixes WebAssembly#2751 Signed-off-by: Gaurav Chaudhary <chaudharygaurav2004@gmail.com>
ANAMASGARD
force-pushed
the
fix/wasm2c-contradictory-import-abort
branch
from
August 18, 2026 02:21
4f769c3 to
1a0967d
Compare
Contributor
Author
|
@shravanrn thanks for review I have removed the clears, rebased onto latest main . |
shravanrn
approved these changes
Aug 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2751
Summary
UNIMPLEMENTED("contradictory import declaration")with a stderr diagnostic andResult::ErrorComputeUniqueImports()at the start ofWriteModule()so codegen never runs on unlinkable modulestest/wasm2c/contradictory-imports.txtTest plan
wasm2c dup.wasmexits 1 with error message (no abort)python3 test/run-tests.py test/wasm2c/contradictory-imports.txtpython3 test/run-tests.py test/wasm2c/./out/wabt-unittests