Skip to content

feat: (CM64) Validate 64bit waitables #2514

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

Open
michael-weigelt wants to merge 6 commits into
base: main
Choose a base branch
from
+214 −18
Open

feat: (CM64) Validate 64bit waitables #2514

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1da36f2
wip
michael-weigelt May 6, 2026
2f320c7
waitable
michael-weigelt May 15, 2026
c5a1b63
tests
michael-weigelt May 15, 2026
0c1e8f4
RUN
michael-weigelt May 15, 2026
10789e6
fix?
michael-weigelt May 15, 2026
fdea69b
files
michael-weigelt May 15, 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
16 changes: 10 additions & 6 deletions crates/wasmparser/src/validator/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,9 +2118,11 @@ impl ComponentState {
}

self.cabi_memory_at(memory, offset)?;

self.core_funcs
.push(types.intern_func_type(FuncType::new([ValType::I32; 2], [ValType::I32]), offset));
let memory64 = self.memory_at(memory, offset)?.memory64;
let ty = if memory64 { ValType::I64 } else { ValType::I32 };
self.core_funcs.push(
types.intern_func_type(FuncType::new([ValType::I32, ty], [ValType::I32]), offset),
);
Ok(())
}

Expand All @@ -2138,9 +2140,11 @@ impl ComponentState {
}

self.cabi_memory_at(memory, offset)?;

self.core_funcs
.push(types.intern_func_type(FuncType::new([ValType::I32; 2], [ValType::I32]), offset));
let memory64 = self.memory_at(memory, offset)?.memory64;
let ty = if memory64 { ValType::I64 } else { ValType::I32 };
self.core_funcs.push(
types.intern_func_type(FuncType::new([ValType::I32, ty], [ValType::I32]), offset),
);
Ok(())
}

Expand Down
2 changes: 2 additions & 0 deletions crates/wit-component/src/validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@ impl ImportMap {
}

if let Some(info) = names.waitable_set_wait(name) {
// [ValType::I32, Addrtype]
Comment thread
michael-weigelt marked this conversation as resolved.
Outdated
let expected = FuncType::new([ValType::I32; 2], [ValType::I32]);
validate_func_sig(name, &expected, ty)?;
return Ok(Import::WaitableSetWait {
Expand All @@ -642,6 +643,7 @@ impl ImportMap {
}

if let Some(info) = names.waitable_set_poll(name) {
// [ValType::I32, Addrtype
let expected = FuncType::new([ValType::I32; 2], [ValType::I32]);
validate_func_sig(name, &expected, ty)?;
return Ok(Import::WaitableSetPoll {
Expand Down
Loading