Implement imported/exported modules/instances (#2461)

* Implement imported/exported modules/instances

This commit implements the final piece of the module linking proposal
which is to flesh out the support for importing/exporting instances and
modules. This ended up having a few changes:

* Two more `PrimaryMap` instances are now stored in an `Instance`. The value
  for instances is `InstanceHandle` (pretty easy) and for modules it's
  `Box<dyn Any>` (less easy).

* The custom host state for `InstanceHandle` for `wasmtime` is now
  `Arc<TypeTables` to be able to fully reconstruct an instance's types
  just from its instance.

* Type matching for imports now has been updated to take
  instances/modules into account.

One of the main downsides of this implementation is that type matching
of imports is duplicated between wasmparser and wasmtime, leading to
posssible bugs especially in the subtelties of module linking. I'm not
sure how best to unify these two pieces of validation, however, and it
may be more trouble than it's worth.

cc #2094

* Update wat/wast/wasmparser

* Review comments

* Fix a bug in publish script to vendor the right witx

Currently there's two witx binaries in our repository given the two wasi
spec submodules, so this updates the publication script to vendor the
right one.
This commit is contained in:
Alex Crichton
2020-12-03 10:15:42 -06:00
committed by GitHub
parent b93381e126
commit f003388ec7
37 changed files with 1016 additions and 345 deletions

View File

@@ -1,13 +1,14 @@
use crate::vmcontext::{
VMCallerCheckedAnyfunc, VMContext, VMGlobalDefinition, VMMemoryDefinition, VMTableDefinition,
};
use crate::InstanceHandle;
use std::any::Any;
use std::ptr::NonNull;
use wasmtime_environ::wasm::Global;
use wasmtime_environ::{MemoryPlan, TablePlan};
/// The value of an export passed from one instance to another.
#[derive(Debug, Clone)]
pub enum Export {
pub enum Export<'a> {
/// A function export value.
Function(ExportFunction),
@@ -19,6 +20,12 @@ pub enum Export {
/// A global export value.
Global(ExportGlobal),
/// An instance
Instance(&'a InstanceHandle),
/// A module
Module(&'a dyn Any),
}
/// A function export value.
@@ -31,8 +38,8 @@ pub struct ExportFunction {
pub anyfunc: NonNull<VMCallerCheckedAnyfunc>,
}
impl From<ExportFunction> for Export {
fn from(func: ExportFunction) -> Export {
impl<'a> From<ExportFunction> for Export<'a> {
fn from(func: ExportFunction) -> Export<'a> {
Export::Function(func)
}
}
@@ -48,8 +55,8 @@ pub struct ExportTable {
pub table: TablePlan,
}
impl From<ExportTable> for Export {
fn from(func: ExportTable) -> Export {
impl<'a> From<ExportTable> for Export<'a> {
fn from(func: ExportTable) -> Export<'a> {
Export::Table(func)
}
}
@@ -65,8 +72,8 @@ pub struct ExportMemory {
pub memory: MemoryPlan,
}
impl From<ExportMemory> for Export {
fn from(func: ExportMemory) -> Export {
impl<'a> From<ExportMemory> for Export<'a> {
fn from(func: ExportMemory) -> Export<'a> {
Export::Memory(func)
}
}
@@ -82,8 +89,8 @@ pub struct ExportGlobal {
pub global: Global,
}
impl From<ExportGlobal> for Export {
fn from(func: ExportGlobal) -> Export {
impl<'a> From<ExportGlobal> for Export<'a> {
fn from(func: ExportGlobal) -> Export<'a> {
Export::Global(func)
}
}