From ca90ffbd0a36ee1d50a75086cba91471ac6a1d89 Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Tue, 29 Aug 2023 15:17:20 +0100 Subject: [PATCH 1/4] Replace wasmer with a heliaxdev fork of v2.3.0 --- Cargo.lock | 42 +++++++++------------------ shared/Cargo.toml | 12 ++++---- wasm/Cargo.lock | 42 +++++++++------------------ wasm_for_tests/wasm_source/Cargo.lock | 42 +++++++++------------------ 4 files changed, 48 insertions(+), 90 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a069b0956..f0fa0b8325 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7566,8 +7566,7 @@ dependencies = [ [[package]] name = "wasmer" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "indexmap 1.9.3", @@ -7593,8 +7592,7 @@ dependencies = [ [[package]] name = "wasmer-artifact" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enumset", "loupe", @@ -7606,8 +7604,7 @@ dependencies = [ [[package]] name = "wasmer-cache" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0def391ee1631deac5ac1e6ce919c07a5ccb936ad0fd44708cdc2365c49561a4" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "blake3", "hex", @@ -7618,8 +7615,7 @@ dependencies = [ [[package]] name = "wasmer-compiler" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enumset", "loupe", @@ -7636,8 +7632,7 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -7656,8 +7651,7 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ca2a35204d8befa85062bc7aac259a8db8070b801b8a783770ba58231d729e" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "byteorder", "dynasm", @@ -7675,8 +7669,7 @@ dependencies = [ [[package]] name = "wasmer-derive" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "proc-macro-error", "proc-macro2", @@ -7687,8 +7680,7 @@ dependencies = [ [[package]] name = "wasmer-engine" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "enumset", @@ -7710,8 +7702,7 @@ dependencies = [ [[package]] name = "wasmer-engine-dylib" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "enum-iterator", @@ -7736,8 +7727,7 @@ dependencies = [ [[package]] name = "wasmer-engine-universal" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "enumset", @@ -7756,8 +7746,7 @@ dependencies = [ [[package]] name = "wasmer-engine-universal-artifact" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enum-iterator", "enumset", @@ -7772,8 +7761,7 @@ dependencies = [ [[package]] name = "wasmer-object" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "object 0.28.4", "thiserror", @@ -7784,8 +7772,7 @@ dependencies = [ [[package]] name = "wasmer-types" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "enum-iterator", @@ -7800,8 +7787,7 @@ dependencies = [ [[package]] name = "wasmer-vm" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "cc", diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 28711a0329..12038c6ac8 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -133,12 +133,12 @@ tiny-hderive.workspace = true toml.workspace = true tracing.workspace = true wasm-instrument = {version = "0.4.0", features = ["sign_ext"], optional = true} -wasmer = {version = "=2.3.0", optional = true} -wasmer-cache = {version = "=2.3.0", optional = true} -wasmer-compiler-singlepass = {version = "=2.3.0", optional = true} -wasmer-engine-dylib = {version = "=2.3.0", optional = true} -wasmer-engine-universal = {version = "=2.3.0", optional = true} -wasmer-vm = {version = "2.3.0", optional = true} +wasmer = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true} +wasmer-cache = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true} +wasmer-compiler-singlepass = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true} +wasmer-engine-dylib = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true} +wasmer-engine-universal = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true} +wasmer-vm = {git = "https://github.com/heliaxdev/wasmer", rev = "833721a1b21cd192e7f044abe2139d03ba291149", optional = true} wasmparser.workspace = true zeroize.workspace = true diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index be65562b6d..6872803242 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -6046,8 +6046,7 @@ dependencies = [ [[package]] name = "wasmer" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "indexmap 1.9.3", @@ -6073,8 +6072,7 @@ dependencies = [ [[package]] name = "wasmer-artifact" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enumset", "loupe", @@ -6086,8 +6084,7 @@ dependencies = [ [[package]] name = "wasmer-cache" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0def391ee1631deac5ac1e6ce919c07a5ccb936ad0fd44708cdc2365c49561a4" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "blake3", "hex", @@ -6098,8 +6095,7 @@ dependencies = [ [[package]] name = "wasmer-compiler" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enumset", "loupe", @@ -6116,8 +6112,7 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -6136,8 +6131,7 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ca2a35204d8befa85062bc7aac259a8db8070b801b8a783770ba58231d729e" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "byteorder", "dynasm", @@ -6155,8 +6149,7 @@ dependencies = [ [[package]] name = "wasmer-derive" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "proc-macro-error", "proc-macro2", @@ -6167,8 +6160,7 @@ dependencies = [ [[package]] name = "wasmer-engine" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "enumset", @@ -6190,8 +6182,7 @@ dependencies = [ [[package]] name = "wasmer-engine-dylib" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "enum-iterator", @@ -6216,8 +6207,7 @@ dependencies = [ [[package]] name = "wasmer-engine-universal" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "enumset", @@ -6236,8 +6226,7 @@ dependencies = [ [[package]] name = "wasmer-engine-universal-artifact" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enum-iterator", "enumset", @@ -6252,8 +6241,7 @@ dependencies = [ [[package]] name = "wasmer-object" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "object 0.28.4", "thiserror", @@ -6264,8 +6252,7 @@ dependencies = [ [[package]] name = "wasmer-types" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "enum-iterator", @@ -6280,8 +6267,7 @@ dependencies = [ [[package]] name = "wasmer-vm" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "cc", diff --git a/wasm_for_tests/wasm_source/Cargo.lock b/wasm_for_tests/wasm_source/Cargo.lock index 77b2082a4e..554b88c418 100644 --- a/wasm_for_tests/wasm_source/Cargo.lock +++ b/wasm_for_tests/wasm_source/Cargo.lock @@ -6017,8 +6017,7 @@ dependencies = [ [[package]] name = "wasmer" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "indexmap 1.9.3", @@ -6044,8 +6043,7 @@ dependencies = [ [[package]] name = "wasmer-artifact" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaf9428c29c1d8ad2ac0e45889ba8a568a835e33fd058964e5e500f2f7ce325" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enumset", "loupe", @@ -6057,8 +6055,7 @@ dependencies = [ [[package]] name = "wasmer-cache" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0def391ee1631deac5ac1e6ce919c07a5ccb936ad0fd44708cdc2365c49561a4" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "blake3", "hex", @@ -6069,8 +6066,7 @@ dependencies = [ [[package]] name = "wasmer-compiler" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67a6cd866aed456656db2cfea96c18baabbd33f676578482b85c51e1ee19d2c" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enumset", "loupe", @@ -6087,8 +6083,7 @@ dependencies = [ [[package]] name = "wasmer-compiler-cranelift" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48be2f9f6495f08649e4f8b946a2cbbe119faf5a654aa1457f9504a99d23dae0" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -6107,8 +6102,7 @@ dependencies = [ [[package]] name = "wasmer-compiler-singlepass" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ca2a35204d8befa85062bc7aac259a8db8070b801b8a783770ba58231d729e" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "byteorder", "dynasm", @@ -6126,8 +6120,7 @@ dependencies = [ [[package]] name = "wasmer-derive" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e50405cc2a2f74ff574584710a5f2c1d5c93744acce2ca0866084739284b51" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "proc-macro-error", "proc-macro2", @@ -6138,8 +6131,7 @@ dependencies = [ [[package]] name = "wasmer-engine" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f98f010978c244db431b392aeab0661df7ea0822343334f8f2a920763548e45" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "enumset", @@ -6161,8 +6153,7 @@ dependencies = [ [[package]] name = "wasmer-engine-dylib" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "enum-iterator", @@ -6187,8 +6178,7 @@ dependencies = [ [[package]] name = "wasmer-engine-universal" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "cfg-if 1.0.0", "enumset", @@ -6207,8 +6197,7 @@ dependencies = [ [[package]] name = "wasmer-engine-universal-artifact" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f1db3f54152657eb6e86c44b66525ff7801dad8328fe677da48dd06af9ad41" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "enum-iterator", "enumset", @@ -6223,8 +6212,7 @@ dependencies = [ [[package]] name = "wasmer-object" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d831335ff3a44ecf451303f6f891175c642488036b92ceceb24ac8623a8fa8b" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "object 0.28.4", "thiserror", @@ -6235,8 +6223,7 @@ dependencies = [ [[package]] name = "wasmer-types" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "enum-iterator", @@ -6251,8 +6238,7 @@ dependencies = [ [[package]] name = "wasmer-vm" version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" +source = "git+https://github.com/heliaxdev/wasmer?rev=833721a1b21cd192e7f044abe2139d03ba291149#833721a1b21cd192e7f044abe2139d03ba291149" dependencies = [ "backtrace", "cc", From 91e2b598ef3a8fc97c8d9fcd6f7f525394ff1a7c Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Tue, 29 Aug 2023 15:55:43 +0100 Subject: [PATCH 2/4] Temporarily disable the stack limiter tests on Apple silicon --- shared/src/vm/wasm/run.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shared/src/vm/wasm/run.rs b/shared/src/vm/wasm/run.rs index 95cf2afc38..c384df0598 100644 --- a/shared/src/vm/wasm/run.rs +++ b/shared/src/vm/wasm/run.rs @@ -488,6 +488,7 @@ mod tests { /// Test that when a transaction wasm goes over the stack-height limit, the /// execution is aborted. #[test] + #[cfg_attr(all(target_arch = "aarch64", target_os = "macos"), ignore)] fn test_tx_stack_limiter() { // Because each call into `$loop` inside the wasm consumes 5 stack // heights except for the terminal call, this should hit the stack @@ -509,6 +510,7 @@ mod tests { /// Test that when a VP wasm goes over the stack-height limit, the execution /// is aborted. #[test] + #[cfg_attr(all(target_arch = "aarch64", target_os = "macos"), ignore)] fn test_vp_stack_limiter() { // Because each call into `$loop` inside the wasm consumes 5 stack // heights except for the terminal call, this should hit the stack From 60807304d51e83a477b74b7b4c037c67f03217b8 Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Wed, 30 Aug 2023 13:19:48 +0100 Subject: [PATCH 3/4] Document reason for disabling wasm stack limiter tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Tomáš Zemanovič --- shared/src/vm/wasm/run.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shared/src/vm/wasm/run.rs b/shared/src/vm/wasm/run.rs index c384df0598..2c49b1616c 100644 --- a/shared/src/vm/wasm/run.rs +++ b/shared/src/vm/wasm/run.rs @@ -488,6 +488,9 @@ mod tests { /// Test that when a transaction wasm goes over the stack-height limit, the /// execution is aborted. #[test] + // NB: Disabled on aarch64 macOS since a fix for + // https://github.com/wasmerio/wasmer/issues/4072 + // reduced the available stack space on mac #[cfg_attr(all(target_arch = "aarch64", target_os = "macos"), ignore)] fn test_tx_stack_limiter() { // Because each call into `$loop` inside the wasm consumes 5 stack @@ -510,6 +513,9 @@ mod tests { /// Test that when a VP wasm goes over the stack-height limit, the execution /// is aborted. #[test] + // NB: Disabled on aarch64 macOS since a fix for + // https://github.com/wasmerio/wasmer/issues/4072 + // reduced the available stack space on mac #[cfg_attr(all(target_arch = "aarch64", target_os = "macos"), ignore)] fn test_vp_stack_limiter() { // Because each call into `$loop` inside the wasm consumes 5 stack From 9f0f946443f37f198c5b3dbcc0283cf9045715ab Mon Sep 17 00:00:00 2001 From: Tiago Carvalho Date: Tue, 29 Aug 2023 15:57:49 +0100 Subject: [PATCH 4/4] Add changelog for #1778 --- .changelog/unreleased/bug-fixes/1778-fix-wasm-vm-aarch64-mac.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/1778-fix-wasm-vm-aarch64-mac.md diff --git a/.changelog/unreleased/bug-fixes/1778-fix-wasm-vm-aarch64-mac.md b/.changelog/unreleased/bug-fixes/1778-fix-wasm-vm-aarch64-mac.md new file mode 100644 index 0000000000..22c3688460 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/1778-fix-wasm-vm-aarch64-mac.md @@ -0,0 +1,2 @@ +- Fix wasm pointer misalignment issues on Apple silicon devices. + ([\#1778](https://github.com/anoma/namada/pull/1778)) \ No newline at end of file