use fixed macros (#183)

Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>

Author: jprendes

Cargo.lock

@@ -13,4 +13,4 @@ repository = "https://github.com/hyperlight-dev/hyperlight-wasm"
 readme = "README.md"
 
 [workspace.dependencies]
-hyperlight-host = { version = "0.8.0", default-features = false, features = ["executable_heap", "init-paging"] }
+hyperlight-host = { version = "0.9.0", default-features = false, features = ["executable_heap", "init-paging"] }

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.8.0" }
+hyperlight-component-macro = { version = "0.9.0" }
 examples_common = { path = "../examples_common" }
 criterion = { version = "0.7.0", features = ["html_reports"] }
 crossbeam-queue = "0.3"

src/hyperlight_wasm/Cargo.toml

@@ -16,4 +16,4 @@ proc-macro2 = { version = "1.0.101" }
 syn = { version = "2.0.106" }
 itertools = { version = "0.14.0" }
 prettyplease = { version = "0.2.37" }
-hyperlight-component-util = { version = "0.8.0" }
+hyperlight-component-util = { version = "0.9.0" }

src/hyperlight_wasm_macro/Cargo.lock

@@ -24,8 +24,8 @@ limitations under the License.
 //    the `Resources` struct with.)
 
 use hyperlight_component_util::emit::{
-    FnName, State, WitName, kebab_to_fn, kebab_to_namespace, kebab_to_type, kebab_to_var,
-    split_wit_name,
+    FnName, ResolvedBoundVar, State, WitName, kebab_to_fn, kebab_to_namespace, kebab_to_type,
+    kebab_to_var, split_wit_name,
 };
 use hyperlight_component_util::etypes::{
     self, Component, Defined, ExternDecl, ExternDesc, Handleable, Instance, Tyvar,
@@ -94,10 +94,12 @@ fn emit_import_extern_decl<'b>(
         }
         ExternDesc::Type(t) => match t {
             Defined::Handleable(Handleable::Var(Tyvar::Bound(b))) => {
-                let (b, _) = s.resolve_tv(*b);
+                let ResolvedBoundVar::Resource { rtidx } = s.resolve_bound_var(*b) else {
+                    return quote! {};
+                };
                 let li = format_ident!("li{}", depth);
                 let edkn = ed.kebab_name;
-                let rtid = format_ident!("HostResource{}", b);
+                let rtid = format_ident!("HostResource{rtidx}");
                 quote! {
                     #li.resource(#edkn, ::wasmtime::component::ResourceType::host::<#rtid>(), |_, _| { Ok(()) });
                 }

src/hyperlight_wasm_macro/Cargo.toml

@@ -11,9 +11,9 @@ doctest = false
 bench = false
 
 [dependencies]
-hyperlight-common = { version = "0.8.0", default-features = false }
-hyperlight-guest-bin = { version = "0.8.0", features = [ "printf" ] }
-hyperlight-guest = { version = "0.8.0" }
+hyperlight-common = { version = "0.9.0", default-features = false }
+hyperlight-guest-bin = { version = "0.9.0", features = [ "printf" ] }
+hyperlight-guest = { version = "0.9.0" }
 wasmtime = { version = "36.0.2", default-features = false, features = [ "runtime", "custom-virtual-memory", "custom-native-signals", "component-model" ] }
 hyperlight-wasm-macro = { path = "../hyperlight_wasm_macro" }
 spin = "0.10.0"