Add validations for imports during instantiation #8086
+256
−118
Conversation
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
stevenfontanella
force-pushed
the
import-validation
branch
from
4c82930 to
9c0a77c
Compare
stevenfontanella
force-pushed
the
multithread
branch
from
44c5834 to
62b613b
Compare
stevenfontanella
force-pushed
the
import-validation
branch
from
9c0a77c to
760c35a
Compare
stevenfontanella
force-pushed
the
multithread
branch
from
62b613b to
bb0d612
Compare
stevenfontanella
force-pushed
the
import-validation
branch
2 times, most recently
from
3920f0c to
766d753
Compare
stevenfontanella
force-pushed
the
import-validation
branch
6 times, most recently
from
1f212af to
1368f6a
Compare
stevenfontanella
force-pushed
the
import-validation
branch
from
1368f6a to
cb635ed
Compare
stevenfontanella
force-pushed
the
import-validation
branch
from
cb635ed to
35d3f13
Compare
stevenfontanella
force-pushed
the
import-validation
branch
from
35d3f13 to
abb3c33
Compare
stevenfontanella
force-pushed
the
import-validation
branch
from
abb3c33 to
08cdd58
Compare
Member
Author
|
Will run this through the fuzzer as well before merging |
kripken
reviewed
Dec 13, 2025
| trap((std::stringstream() | ||
| << "importGlobals: unknown import: " << import->module.str << "." | ||
| << import->name.str) | ||
| .str()); |
Member
There was a problem hiding this comment.
I did not know about this nice pattern for stringstream 😄
|
|
||
| virtual void trap(const char* why) { WASM_UNREACHABLE("unimp"); } | ||
|
|
||
| virtual void trap(std::string_view why) { WASM_UNREACHABLE("unimp"); } |
Member
There was a problem hiding this comment.
Do we really need two trap forms? This does not need to be fast. How about making them both std::string?
| Name name; | ||
| }; | ||
|
|
||
| // Trap if the importable's export's kind doesn't match `kind`. |
Member
There was a problem hiding this comment.
Suggested change
| // Trap if the importable's export's kind doesn't match `kind`. | |
| // Verify that a given Importable, which is exported from a module, is | |
| // actually exported with the proper kind from there. |
This might not be better but I had to read the existing one a few times... maybe being more verbose is clearer?
| return true; | ||
| } | ||
|
|
||
| bool isSubType(const Table& other) { return Table::isSubType(*this, other); } |
Member
There was a problem hiding this comment.
I would prefer to put logic like this in ir/, so that we can keep wasm.h shorter. This might fit in memory-utils.h, table-utils.h etc?
stevenfontanella
added a commit
that referenced
this pull request
Dec 14, 2025
ctor-eval doesn't have access to imports and previously didn't have any special handling for this. Globals would fail to import (https://github.com/WebAssembly/binaryen/blob/main/src/tools/wasm-ctor-eval.cpp#L247), which would prevent further evaluation (https://github.com/WebAssembly/binaryen/blob/main/src/tools/wasm-ctor-eval.cpp#L1451). This is why global-get-init.wast didn't optimize away even though it does nothing. We already stubbed out imports to "env". Change the code to create a stub module for all modules named in imports, so that instantiation is valid and evaluation can continue. This also unblocks #8086 which checks imports and requires them to exist during instantiation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
exact-func-import.wastfrom the testsuite repo, which now passes.ref_func.wastandtags.wastwhich also otherwise fail with the new validations.imports0,imports2,linking0,linking3and partially fixesimports,imports3andmemory64.As followups, we should improve the handling of the "spectest" module by implementing the implicit definition described by the spec, and we should add tracking for exact types of function re-exports so that we can enable import-time type checking for function types.