41780fb1a6
This commit fixes the `wasmtime::Instance` instantiation API when imports have the same name but might be imported under different types. This is handled in the API by listing imports as a list instead of as a name map, but they were interpreted as a name map under the hood causing collisions. This commit now keeps track of the index used to define each import, and the index is passed through in the `Resolver`. Existing implementaitons of `Resolver` all ignore this, but the API now uses it exclusivley to match up `Extern` definitions to imports.
47 lines
1.4 KiB
Rust
47 lines
1.4 KiB
Rust
//! The core WebAssembly spec does not specify how imports are to be resolved
|
|
//! to exports. This file provides one possible way to manage multiple instances
|
|
//! and resolve imports to exports among them.
|
|
|
|
use crate::resolver::Resolver;
|
|
use std::collections::HashMap;
|
|
use wasmtime_runtime::{Export, InstanceHandle};
|
|
|
|
/// A namespace containing instances keyed by name.
|
|
///
|
|
/// Note that `Namespace` implements the `Resolver` trait, so it can resolve
|
|
/// imports using defined exports.
|
|
pub struct Namespace {
|
|
/// Mapping from identifiers to indices in `self.instances`.
|
|
names: HashMap<String, InstanceHandle>,
|
|
}
|
|
|
|
impl Namespace {
|
|
/// Construct a new `Namespace`.
|
|
pub fn new() -> Self {
|
|
Self {
|
|
names: HashMap::new(),
|
|
}
|
|
}
|
|
|
|
/// Install a new `InstanceHandle` in this `Namespace`, optionally with the
|
|
/// given name.
|
|
pub fn name_instance(&mut self, name: String, instance: InstanceHandle) {
|
|
self.names.insert(name, instance);
|
|
}
|
|
|
|
/// Get the instance registered with the given `instance_name`.
|
|
pub fn get_instance(&mut self, name: &str) -> Option<&mut InstanceHandle> {
|
|
self.names.get_mut(name)
|
|
}
|
|
}
|
|
|
|
impl Resolver for Namespace {
|
|
fn resolve(&mut self, _idx: u32, name: &str, field: &str) -> Option<Export> {
|
|
if let Some(instance) = self.names.get_mut(name) {
|
|
instance.lookup(field)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|