Skip to content

Commit bcdc400

Browse files
committed
Merge branch 'tiago/fix-wasm-vm-aarch64-mac' (#1778)
* origin/tiago/fix-wasm-vm-aarch64-mac: Add changelog for #1778 Document reason for disabling wasm stack limiter tests Temporarily disable the stack limiter tests on Apple silicon Replace wasmer with a heliaxdev fork of v2.3.0
2 parents 1f5c905 + 9f0f946 commit bcdc400

File tree

6 files changed

+58
-90
lines changed

6 files changed

+58
-90
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
- Fix wasm pointer misalignment issues on Apple silicon devices.
2+
([\#1778](https://github.com/anoma/namada/pull/1778))

Cargo.lock

Lines changed: 14 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shared/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@ tiny-hderive.workspace = true
133133
toml.workspace = true
134134
tracing.workspace = true
135135
wasm-instrument = {version = "0.4.0", features = ["sign_ext"], optional = true}
136-
wasmer = {version = "=2.3.0", optional = true}
137-
wasmer-cache = {version = "=2.3.0", optional = true}
138-
wasmer-compiler-singlepass = {version = "=2.3.0", optional = true}
139-
wasmer-engine-dylib = {version = "=2.3.0", optional = true}
140-
wasmer-engine-universal = {version = "=2.3.0", optional = true}
141-
wasmer-vm = {version = "2.3.0", optional = true}
136+
wasmer = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true}
137+
wasmer-cache = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true}
138+
wasmer-compiler-singlepass = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true}
139+
wasmer-engine-dylib = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true}
140+
wasmer-engine-universal = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true}
141+
wasmer-vm = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true}
142142
wasmparser.workspace = true
143143
zeroize.workspace = true
144144

shared/src/vm/wasm/run.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,10 @@ mod tests {
588588
/// Test that when a transaction wasm goes over the stack-height limit, the
589589
/// execution is aborted.
590590
#[test]
591+
// NB: Disabled on aarch64 macOS since a fix for
592+
// https://github.com/wasmerio/wasmer/issues/4072
593+
// reduced the available stack space on mac
594+
#[cfg_attr(all(target_arch = "aarch64", target_os = "macos"), ignore)]
591595
fn test_tx_stack_limiter() {
592596
// Because each call into `$loop` inside the wasm consumes 5 stack
593597
// heights except for the terminal call, this should hit the stack
@@ -609,6 +613,10 @@ mod tests {
609613
/// Test that when a VP wasm goes over the stack-height limit, the execution
610614
/// is aborted.
611615
#[test]
616+
// NB: Disabled on aarch64 macOS since a fix for
617+
// https://github.com/wasmerio/wasmer/issues/4072
618+
// reduced the available stack space on mac
619+
#[cfg_attr(all(target_arch = "aarch64", target_os = "macos"), ignore)]
612620
fn test_vp_stack_limiter() {
613621
// Because each call into `$loop` inside the wasm consumes 5 stack
614622
// heights except for the terminal call, this should hit the stack

wasm/Cargo.lock

Lines changed: 14 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)