Skip to content

Commit

Permalink
winch: Enable memory64 in Winch (#8194)
Browse files Browse the repository at this point in the history
Closes: #8089

This commit  unlocks support for the `memory64` proposal in Winch. After all the fixes to heap handling, all the spec and misc tests are passing, which is a good indication regarding the support for this proposal.

I'll like to merge this change after: #8156.
  • Loading branch information
saulecabrera committed Mar 20, 2024
1 parent 8baee53 commit 5e05171
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 4 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,10 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
return denylist || ref_types || simd;
}

if testsuite == "memory64" {
return testname.starts_with("simd") || testname.starts_with("threads");
}

if testsuite != "winch" {
return true;
}
Expand Down
1 change: 0 additions & 1 deletion crates/fuzzing/src/generators/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ impl Config {
pub fn disable_unimplemented_winch_proposals(&mut self) {
self.module_config.config.simd_enabled = false;
self.module_config.config.relaxed_simd_enabled = false;
self.module_config.config.memory64_enabled = false;
self.module_config.config.gc_enabled = false;
self.module_config.config.threads_enabled = false;
self.module_config.config.tail_call_enabled = false;
Expand Down
3 changes: 1 addition & 2 deletions winch/codegen/src/codegen/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,7 @@ impl<'a, 'translation, 'data, P: PtrSize> FuncEnv<'a, 'translation, 'data, P> {
current_length_offset,
style,
ty: if plan.memory.memory64 {
// TODO: Add support for 64-bit memories.
unimplemented!("memory64")
WasmValType::I64
} else {
WasmValType::I32
},
Expand Down

0 comments on commit 5e05171

Please sign in to comment.