Skip to content

Commit d4a0667

Browse files
committed
Updates to wasm parser
Signed-off-by: James Sturtevant <[email protected]>
1 parent 5ee1c52 commit d4a0667

File tree

5 files changed

+27
-17
lines changed

5 files changed

+27
-17
lines changed

Cargo.lock

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

src/hyperlight_wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ windows = { version = "0.61", features = ["Win32_System_Threading"] }
5454
page_size = "0.6.0"
5555

5656
[dev-dependencies]
57-
hyperlight-component-macro = "0.7.0"
57+
hyperlight-component-macro = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "5f2eba98256ec59f07d7513757892f81b7e3b570" }
5858
examples_common = { path = "../examples_common" }
5959
criterion = { version = "0.6.0", features = ["html_reports"] }
6060
crossbeam-queue = "0.3"

src/hyperlight_wasm_macro/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ proc-macro2 = { version = "1.0.93" }
1717
syn = { version = "2.0.96" }
1818
itertools = { version = "0.14.0" }
1919
prettyplease = { version = "0.2.31" }
20-
hyperlight-component-util = { version = "0.7.0" }
20+
hyperlight-component-util = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "5f2eba98256ec59f07d7513757892f81b7e3b570" }

src/hyperlight_wasm_macro/src/wasmguest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn emit_import_extern_decl<'b>(
6868
})
6969
.unzip::<_, _, Vec<_>, Vec<_>>();
7070
let ret = format_ident!("ret");
71-
let is_ret_empty = matches!(&ft.result, etypes::Result::Named(rs) if rs.is_empty());
71+
let is_ret_empty = ft.result.is_none();
7272
let ur = if is_ret_empty {
7373
quote! { () }
7474
} else {
@@ -210,7 +210,7 @@ fn emit_wasm_function_call(
210210

211211
// if the result is empty we don't want a return result with `get_typed_func`
212212
let rwt = match result {
213-
etypes::Result::Named(rs) if rs.is_empty() => {
213+
None => {
214214
quote! {
215215
instance.get_typed_func::<(#(#pwts,)*), ()>(&mut *store, func_idx)?
216216
.call(&mut *store, (#(#pus,)*))?;

src/wasm_runtime/Cargo.lock

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

0 commit comments

Comments
 (0)