From d5f2a9471caae3beef9e66f6d9049340c17f3d30 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Tue, 1 Jul 2025 21:57:33 +0000 Subject: [PATCH] hyperlight_component_macro changes for wasm-parser Signed-off-by: James Sturtevant --- Cargo.lock | 16 ++++++++-------- src/hyperlight_wasm/Cargo.toml | 2 +- src/hyperlight_wasm_macro/Cargo.lock | 7 +++---- src/hyperlight_wasm_macro/Cargo.toml | 3 +-- src/hyperlight_wasm_macro/src/wasmguest.rs | 4 ++-- src/wasm_runtime/Cargo.lock | 13 ++++++------- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 446f478..4b6507d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1275,7 +1275,7 @@ dependencies = [ [[package]] name = "hyperlight-component-macro" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=b61265e4aa9e2ecf8d648b994022caeea0205352#b61265e4aa9e2ecf8d648b994022caeea0205352" dependencies = [ "env_logger", "hyperlight-component-util", @@ -1284,13 +1284,13 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser 0.224.1", + "wasmparser 0.235.0", ] [[package]] name = "hyperlight-component-util" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=b61265e4aa9e2ecf8d648b994022caeea0205352#b61265e4aa9e2ecf8d648b994022caeea0205352" dependencies = [ "itertools 0.14.0", "log", @@ -1298,7 +1298,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser 0.224.1", + "wasmparser 0.235.0", ] [[package]] @@ -3245,9 +3245,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11" +checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" dependencies = [ "bitflags 2.9.1", "hashbrown", @@ -3258,9 +3258,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.233.0" +version = "0.235.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" +checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917" dependencies = [ "bitflags 2.9.1", "hashbrown", diff --git a/src/hyperlight_wasm/Cargo.toml b/src/hyperlight_wasm/Cargo.toml index 401c9c6..e7a22b3 100644 --- a/src/hyperlight_wasm/Cargo.toml +++ b/src/hyperlight_wasm/Cargo.toml @@ -58,7 +58,7 @@ windows = { version = "0.61", features = ["Win32_System_Threading"] } page_size = "0.6.0" [dev-dependencies] -hyperlight-component-macro = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" } +hyperlight-component-macro = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "b61265e4aa9e2ecf8d648b994022caeea0205352" } examples_common = { path = "../examples_common" } criterion = { version = "0.6.0", features = ["html_reports"] } crossbeam-queue = "0.3" diff --git a/src/hyperlight_wasm_macro/Cargo.lock b/src/hyperlight_wasm_macro/Cargo.lock index 1816bae..3b01b24 100644 --- a/src/hyperlight_wasm_macro/Cargo.lock +++ b/src/hyperlight_wasm_macro/Cargo.lock @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "hyperlight-component-util" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=b61265e4aa9e2ecf8d648b994022caeea0205352#b61265e4aa9e2ecf8d648b994022caeea0205352" dependencies = [ "itertools", "log", @@ -60,7 +60,6 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser", ] [[package]] @@ -162,9 +161,9 @@ checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "wasmparser" -version = "0.224.1" +version = "0.235.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11" +checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917" dependencies = [ "bitflags", "hashbrown", diff --git a/src/hyperlight_wasm_macro/Cargo.toml b/src/hyperlight_wasm_macro/Cargo.toml index bb9eb05..3c2a2fc 100644 --- a/src/hyperlight_wasm_macro/Cargo.toml +++ b/src/hyperlight_wasm_macro/Cargo.toml @@ -11,10 +11,9 @@ name = "hyperlight_wasm_macro" proc-macro = true [dependencies] -wasmparser = { version = "0.224.0" } quote = { version = "1.0.38" } proc-macro2 = { version = "1.0.93" } syn = { version = "2.0.96" } itertools = { version = "0.14.0" } prettyplease = { version = "0.2.31" } -hyperlight-component-util = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "ea6fa8f" } +hyperlight-component-util = { version = "0.7.0", git = "https://github.com/hyperlight-dev/hyperlight", rev = "b61265e4aa9e2ecf8d648b994022caeea0205352" } diff --git a/src/hyperlight_wasm_macro/src/wasmguest.rs b/src/hyperlight_wasm_macro/src/wasmguest.rs index ed13682..02c2dce 100644 --- a/src/hyperlight_wasm_macro/src/wasmguest.rs +++ b/src/hyperlight_wasm_macro/src/wasmguest.rs @@ -68,7 +68,7 @@ fn emit_import_extern_decl<'b>( }) .unzip::<_, _, Vec<_>, Vec<_>>(); let ret = format_ident!("ret"); - let is_ret_empty = matches!(&ft.result, etypes::Result::Named(rs) if rs.is_empty()); + let is_ret_empty = ft.result.is_none(); let ur = if is_ret_empty { quote! { () } } else { @@ -210,7 +210,7 @@ fn emit_wasm_function_call( // if the result is empty we don't want a return result with `get_typed_func` let rwt = match result { - etypes::Result::Named(rs) if rs.is_empty() => { + None => { quote! { instance.get_typed_func::<(#(#pwts,)*), ()>(&mut *store, func_idx)? .call(&mut *store, (#(#pus,)*))?; diff --git a/src/wasm_runtime/Cargo.lock b/src/wasm_runtime/Cargo.lock index a80dd4a..c48991f 100644 --- a/src/wasm_runtime/Cargo.lock +++ b/src/wasm_runtime/Cargo.lock @@ -612,7 +612,7 @@ dependencies = [ [[package]] name = "hyperlight-component-util" version = "0.7.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=ea6fa8f#ea6fa8f16dae2325d94af39eb6ac3b441b24dcac" +source = "git+https://github.com/hyperlight-dev/hyperlight?rev=b61265e4aa9e2ecf8d648b994022caeea0205352#b61265e4aa9e2ecf8d648b994022caeea0205352" dependencies = [ "itertools", "log", @@ -620,7 +620,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser 0.224.1", + "wasmparser 0.235.0", ] [[package]] @@ -658,7 +658,6 @@ dependencies = [ "proc-macro2", "quote", "syn", - "wasmparser 0.224.1", ] [[package]] @@ -1773,9 +1772,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.224.1" +version = "0.233.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11" +checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" dependencies = [ "bitflags", "hashbrown", @@ -1786,9 +1785,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.233.0" +version = "0.235.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102" +checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917" dependencies = [ "bitflags", "hashbrown",