T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve handling of types and aliases in components (#5591)

Browse Source 
This commit fixes more cases from #5565 where `export` items introducing
indices wasn't handled by accident. Additionally this fixes support for
aliasing types from instances which largely wasn't working before. Most
of the fixes here are about correctly maintaining Wasmtime's view of the
type index spaces.
This commit is contained in:
Alex Crichton
2023-01-18 18:39:21 -06:00
committed by GitHub
parent 5fd9cb405b
commit 0e92fba7e1
4 changed files with 135 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/environ/src/component/translate.rs
View File

@@ -266,6 +266,7 @@ enum ComponentItemType {
Func(TypeFuncIndex),
Component(ComponentType),
Instance(ComponentInstanceType),
Type(TypeDef),
}
#[derive(Copy, Clone, PartialEq, Eq)]
@@ -621,6 +622,9 @@ impl<'a, 'data> Translator<'a, 'data> {
self.result
.initializers
.push(LocalInitializer::Export(item));
if let ComponentItem::Type(ty) = item {
self.types.push_component_typedef(ty);
}
}
}
@@ -775,7 +779,8 @@ impl<'a, 'data> Translator<'a, 'data> {
ComponentItem::ComponentInstance(i) => Some(ComponentItemType::Instance(
self.result.component_instances[i],
)),
ComponentItem::Module(_) | ComponentItem::Type(_) => None,
ComponentItem::Type(ty) => Some(ComponentItemType::Type(ty)),
ComponentItem::Module(_) => None,
};
map.insert(export.name, idx);
if let Some(ty) = ty {
@@ -848,6 +853,9 @@ impl<'a, 'data> Translator<'a, 'data> {
ComponentInstanceType::Index(ty) => {
let (_url, ty) = &self.types[ty].exports[name];
self.result.push_typedef(*ty);
if let TypeDef::Interface(_) = ty {
self.types.push_component_typedef(*ty);
}
}
// An imported component was instantiated so the type of the aliased
@@ -856,6 +864,9 @@ impl<'a, 'data> Translator<'a, 'data> {
ComponentInstanceType::InstantiatedIndex(ty) => {
let (_, ty) = self.types[ty].exports[name];
self.result.push_typedef(ty);
if let TypeDef::Interface(_) = ty {
self.types.push_component_typedef(ty);
}
}
// A static nested component was instantiated which means that the
@@ -902,6 +913,9 @@ impl<'a, 'data> Translator<'a, 'data> {
ComponentItemType::Instance(ty) => {
self.result.component_instances.push(ty);
}
ComponentItemType::Type(ty) => {
self.types.push_component_typedef(ty);
}
}
}
}