Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/hyperlight_component_macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ name = "hyperlight_component_macro"
proc-macro = true

[dependencies]
wasmparser = { version = "0.248.0" }
quote = { version = "1.0.45" }
proc-macro2 = { version = "1.0.106" }
syn = { version = "2.0.117" }
Expand Down
2 changes: 1 addition & 1 deletion src/hyperlight_component_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Shared implementation for the procedural macros that generate Hyperlight host an
name = "hyperlight_component_util"

[dependencies]
wasmparser = { version = "0.248.0" }
wasmparser = { version = "0.249.0" }
quote = { version = "1.0.45" }
proc-macro2 = { version = "1.0.106" }
syn = { version = "2.0.117" }
Expand Down
6 changes: 3 additions & 3 deletions src/hyperlight_component_util/src/component.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use wasmparser::Payload::{
ComponentAliasSection, ComponentExportSection, ComponentTypeSection, Version,
};
use wasmparser::{
ComponentAlias, ComponentExternalKind, ComponentOuterAliasKind, ComponentType,
ComponentTypeRef, Payload,
ComponentAlias, ComponentExternName, ComponentExternalKind, ComponentOuterAliasKind,
ComponentType, ComponentTypeRef, Payload,
};

use crate::etypes::{Component, Ctx, Defined};
Expand Down Expand Up @@ -118,7 +118,7 @@ pub fn read_component_single_exported_type<'a>(
// picks the world index if world_name is passed in the proc_macro
// else picks the index of last type, exported by core module
if let Some(world) = world_name.as_ref() {
let name = ce.name.0;
let ComponentExternName { name, .. } = ce.name;
if name.eq_ignore_ascii_case(world) {
selected_type_idx = Some(ctx.types.len() - 1);
}
Expand Down
40 changes: 28 additions & 12 deletions src/hyperlight_component_util/src/elaborate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ limitations under the License.
//! substitute.rs for more details of the approach here).

use wasmparser::{
ComponentAlias, ComponentDefinedType, ComponentFuncType, ComponentOuterAliasKind,
ComponentType, ComponentTypeDeclaration, ComponentTypeRef, ComponentValType,
CompositeInnerType, CoreType, InstanceTypeDeclaration, ModuleTypeDeclaration, OuterAliasKind,
PrimitiveValType, TypeBounds, TypeRef,
ComponentAlias, ComponentDefinedType, ComponentExternName, ComponentFuncType,
ComponentOuterAliasKind, ComponentType, ComponentTypeDeclaration, ComponentTypeRef,
ComponentValType, CompositeInnerType, CoreType, InstanceTypeDeclaration, ModuleTypeDeclaration,
OuterAliasKind, PrimitiveValType, TypeBounds, TypeRef,
};

use crate::etypes::{
Expand Down Expand Up @@ -536,13 +536,19 @@ impl<'p, 'a> Ctx<'p, 'a> {
self.add_core_or_component_ed(ed);
Ok(None)
}
InstanceTypeDeclaration::Export { name, ty } => {
InstanceTypeDeclaration::Export {
name: export_name,
ty,
} => {
let ComponentExternName {
name: kebab_name, ..
} = *export_name;
let (vs, ed) = self.elab_extern_desc(ty)?;
let sub = self.bound_to_evars(Some(name.0), &vs);
let sub = self.bound_to_evars(Some(kebab_name), &vs);
let ed = sub.extern_desc(&ed).not_void();
self.add_ed(&ed);
Ok(Some(ExternDecl {
kebab_name: name.0,
kebab_name,
desc: ed,
}))
}
Expand Down Expand Up @@ -634,27 +640,37 @@ impl<'p, 'a> Ctx<'p, 'a> {
self.add_core_or_component_ed(ed);
Ok((None, None))
}
ComponentTypeDeclaration::Export { name, ty, .. } => {
ComponentTypeDeclaration::Export {
name: export_name,
ty,
..
} => {
let ComponentExternName {
name: kebab_name, ..
} = *export_name;
let (vs, ed) = self.elab_extern_desc(ty)?;
let sub = self.bound_to_evars(Some(name.0), &vs);
let sub = self.bound_to_evars(Some(kebab_name), &vs);
let ed = sub.extern_desc(&ed).not_void();
self.add_ed(&ed);
Ok((
None,
Some(ExternDecl {
kebab_name: name.0,
kebab_name,
desc: ed,
}),
))
}
ComponentTypeDeclaration::Import(i) => {
let ComponentExternName {
name: kebab_name, ..
} = i.name;
let (vs, ed) = self.elab_extern_desc(&i.ty)?;
let sub = self.bound_to_uvars(Some(i.name.0), &vs, true);
let sub = self.bound_to_uvars(Some(kebab_name), &vs, true);
let ed = sub.extern_desc(&ed).not_void();
self.add_ed(&ed);
Ok((
Some(ExternDecl {
kebab_name: i.name.0,
kebab_name,
desc: ed,
}),
None,
Expand Down
5 changes: 2 additions & 3 deletions src/tests/rust_guests/witguest/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading