Fix Witty export of functions with 16 parameters #2429
Merged
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
Instead of manually creating the very deeply nested type.
Allow usage of 17 parameters with typed exported functions.
Keep them as flat parameters instead, even if the return type needs to be lowered as well.
They were added to work-around the issue with function parameters that flattened to 16 flat types, and with the fix they are no longer needed.
jvff
force-pushed
the
fix-witty-export-of-functions-with-16-parameters
branch
from
d8d341c
to
e502be5
Compare
ma2bd
reviewed
Aug 30, 2024
| @@ -159,7 +159,7 @@ wasm-instrument = "0.4.0" | |||
| wasmer = { package = "linera-wasmer", version = "4.3.6-linera.3", default-features = false } | |||
| wasmer-compiler-singlepass = { package = "linera-wasmer-compiler-singlepass", version = "4.3.6-linera.3" } | |||
| wasmparser = "0.101.1" | |||
| wasmtime = "24.0.0" | |||
| wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "58f82587462543e912b4edcbb247842711ba6415" } | |||
There was a problem hiding this comment.
The fix we need hasn't been released yet. I added a TODO to update this once a release is available (they tend to release often, so hopefully soon).
ma2bd
approved these changes
Aug 30, 2024
Instead of pinning to the commit with the necessary fix.
ma2bd
pushed a commit
that referenced
this pull request
Aug 31, 2024
This was referenced Sep 24, 2024
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.
Motivation
When exporting functions with a specific signature type (with parameters that are flattened to exactly 16 flat types and with a return type that flattens to more than one flat type) to a Wasm instance, Witty's
#[wit_export]macro would incorrectly lower all parameters and return types to the type.This is different from what was specified in the specification.
Proposal
Don't lower the parameters of functions if they can be flattened into 16 flat types, even if the return type is lowered into the heap.
Test Plan
Ran tests manually to ensure that the
test_memory_run_application_with_dependencypasses without the dummy parameter that was introduced previously as a workaround before this fix.Release Plan
Links