Updates for integrating validation in Wasmtime #62
Conversation
This file contains 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
|
Hm actually I forgot there's one more large-ish feature, so I'll be adding that on here. |
|
Ok I've added the API intended, which was |
This commit is a batch of updates I've made and found when integrating wasmparser's validation more intrusively into Wasmtime. The changes made here are: * `WasmFeatures` is now exposed as a standalone type so it can be shared with other crates. This way only one crate, wasmparser, declares the "bag of features" and everyone else can just reference that one bag. * Parsing locals is deferred in `code_section_entry` to actual validation. Helper methods have been added to advance a `BinaryReader` by reading the locals, as well as methods added to define locals yourself. The intention here is to avoid parsing the locals section twice, once in `wasmparser` and once by the application. This also removed a few `read_local*` methods from `BinaryReader` to defer validation to `Validator`. * `WasmTypeDef` and `type_at` have been removed from `WasmModuleResources`. These weren't ever really that useful and callers only ever cared about function types anyway. The previous `func_type_at` method has been repurposed for looking up a type index and a new `type_of_function` looks up the type of a function by index. * Parsing for element segments was slightly updated to ensure that `externref` segments don't have `ref.func` in them. * Add a `FuncValidator::new` API which allows creating one independent of a `Validator`.
alexcrichton
force-pushed
the
wasmtime-parser-updates
branch
from
e67937d to
54c6bf6
Compare
|
Ok, and another commit for |
| @@ -73,7 +73,7 @@ impl Range { | |||
| } | |||
|
|
|||
| /// A binary reader of the WebAssembly structures and types. | |||
| #[derive(Clone, Debug)] | |||
| #[derive(Clone, Debug, Hash)] | |||
There was a problem hiding this comment.
I wonder how/where Hash will be used -- buffer can be long.
There was a problem hiding this comment.
FWIW this is used here where we has the contents of functions for the internal cache.
Migrate the old iterator constructors to these trait methods and tidy up the implementations a bit to rely on `Range` for all the heavy lifting.
alexcrichton
force-pushed
the
wasmtime-parser-updates
branch
from
a00963d to
ca1475a
Compare
yurydelendik
approved these changes
Jul 22, 2020
fitzgen
pushed a commit
to fitzgen/wasm-tools
that referenced
this pull request
Oct 21, 2020
dhil
added a commit
to dhil/wasm-tools
that referenced
this pull request
Feb 23, 2024
This patch merges with upstream and attempts to fix the CI publish job.
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.
This commit is a batch of updates I've made and found when integrating
wasmparser's validation more intrusively into Wasmtime. The changes made
here are:
WasmFeaturesis now exposed as a standalone type so it can be sharedwith other crates. This way only one crate, wasmparser, declares the
"bag of features" and everyone else can just reference that one bag.
Parsing locals is deferred in
code_section_entryto actualvalidation. Helper methods have been added to advance a
BinaryReaderby reading the locals, as well as methods added to define locals
yourself. The intention here is to avoid parsing the locals section
twice, once in
wasmparserand once by the application. This alsoremoved a few
read_local*methods fromBinaryReaderto defervalidation to
Validator.WasmTypeDefandtype_athave been removed fromWasmModuleResources. These weren't ever really that useful andcallers only ever cared about function types anyway. The previous
func_type_atmethod has been repurposed for looking up a type indexand a new
type_of_functionlooks up the type of a function by index.Parsing for element segments was slightly updated to ensure that
externrefsegments don't haveref.funcin them.