Skip to content

Pass flattened fixed-length lists as a pointer to linear memory #2579

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

Draft
cpetig wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Pass flattened fixed-length lists as a pointer to linear memory #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba241dd
Pass flattened fixed-length lists as a pointer
cpetig Jul 26, 2026
071641e
fix the matching tests
cpetig Jul 26, 2026
c251fb4
bless the new test results
cpetig Jul 26, 2026
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
6 changes: 1 addition & 5 deletions crates/wasmparser/src/validator/component_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1632,11 +1632,7 @@ impl ComponentDefinedType {
lowered_types.try_push(ptr_size.core_type())
&& lowered_types.try_push(ptr_size.core_type())
}
Self::FixedLengthList {
element: ty,
length,
..
} => (0..*length).all(|_n| ty.push_wasm_types(ptr_size, types, lowered_types)),
Self::FixedLengthList { .. } => lowered_types.try_push(ptr_size.core_type()),
Self::Tuple(t) => t
.types
.iter()
Expand Down
4 changes: 1 addition & 3 deletions crates/wit-parser/src/abi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,7 @@ impl Resolve {
result.push(WasmType::Pointer) && result.push(WasmType::Length)
}

TypeDefKind::FixedLengthList(ty, size) => {
self.push_flat_list((0..*size).map(|_| ty), result)
}
TypeDefKind::FixedLengthList(_, _) => result.push(WasmType::Pointer),

TypeDefKind::Variant(v) => {
result.push(v.tag().into())
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/component-model/async/abi.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
(memory (export "memory") 1)
(func (export "cb") (param i32 i32 i32) (result i32) unreachable)
(func (export "realloc") (param i32 i32 i32 i32) (result i32) unreachable)
(func (export "f") (param i32 i32 i32 i32 i32 i32 i32 i32) (result i32) unreachable))
(func (export "f") (param i32) (result i32) unreachable))
(core instance $m6 (instantiate $m6))
(func async (param "x" (list string 4))
(canon lift (core func $m6 "f") async (callback (core func $m6 "cb"))
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/component-model/async/stackful.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
(core module $m6
(memory (export "memory") 1)
(func (export "realloc") (param i32 i32 i32 i32) (result i32) unreachable)
(func (export "f") (param i32 i32 i32 i32 i32 i32 i32 i32) unreachable))
(func (export "f") (param i32) unreachable))
(core instance $m6 (instantiate $m6))
(func async (param "x" (list string 4))
(canon lift (core func $m6 "f") async
Expand Down
2 changes: 1 addition & 1 deletion tests/cli/component-model/fixed-length-lists.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

(component
(core module $m
(func (export "param-list") (param i32 i32 i32 i32) unreachable)
(func (export "param-list") (param i32) unreachable)
)
(core instance $i (instantiate $m))

Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/cli/component-model/async/abi.wast/1.print
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
(core module $m6 (;5;)
(type (;0;) (func (param i32 i32 i32) (result i32)))
(type (;1;) (func (param i32 i32 i32 i32) (result i32)))
(type (;2;) (func (param i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
(type (;2;) (func (param i32) (result i32)))
(memory (;0;) 1)
(export "memory" (memory 0))
(export "cb" (func 0))
Expand All @@ -108,7 +108,7 @@
(func (;1;) (type 1) (param i32 i32 i32 i32) (result i32)
unreachable
)
(func (;2;) (type 2) (param i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
(func (;2;) (type 2) (param i32) (result i32)
unreachable
)
)
Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/cli/component-model/async/stackful.wast/6.print
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@
(func (;4;) (type 4) (canon lift (core func 4) async (memory 0) (realloc 5)))
(core module $m6 (;5;)
(type (;0;) (func (param i32 i32 i32 i32) (result i32)))
(type (;1;) (func (param i32 i32 i32 i32 i32 i32 i32 i32)))
(type (;1;) (func (param i32)))
(memory (;0;) 1)
(export "memory" (memory 0))
(export "realloc" (func 0))
(export "f" (func 1))
(func (;0;) (type 0) (param i32 i32 i32 i32) (result i32)
unreachable
)
(func (;1;) (type 1) (param i32 i32 i32 i32 i32 i32 i32 i32)
(func (;1;) (type 1) (param i32)
unreachable
)
)
Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/cli/component-model/fixed-length-lists.wast/1.print
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
(component
(core module $m (;0;)
(type (;0;) (func (param i32 i32 i32 i32)))
(type (;0;) (func (param i32)))
(export "param-list" (func 0))
(func (;0;) (type 0) (param i32 i32 i32 i32)
(func (;0;) (type 0) (param i32)
unreachable
)
)
Expand Down
Loading