Update interface types

build.rs

@@ -30,6 +30,7 @@ fn main() -> anyhow::Result<()> {
             test_directory(out, "tests/misc_testsuite", strategy)?;
             test_directory_module(out, "tests/misc_testsuite/bulk-memory-operations", strategy)?;
             test_directory_module(out, "tests/misc_testsuite/reference-types", strategy)?;
+            test_directory_module(out, "tests/misc_testsuite/interface-types", strategy)?;
             Ok(())
         })?;
 

crates/api/Cargo.toml

@@ -9,32 +9,35 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-wasmtime-runtime = { path = "../runtime", version = "0.12.0" }
-wasmtime-environ = { path = "../environ", version = "0.12.0" }
-wasmtime-jit = { path = "../jit", version = "0.12.0" }
-wasmtime-profiling = { path = "../profiling", version = "0.12.0" }
-wasmparser = "0.51.2"
-target-lexicon = { version = "0.10.0", default-features = false }
 anyhow = "1.0.19"
-region = "2.0.0"
-libc = "0.2"
-cfg-if = "0.1.9"
 backtrace = "0.3.42"
-rustc-demangle = "0.1.16"
+cfg-if = "0.1.9"
 lazy_static = "1.4"
+libc = "0.2"
+region = "2.0.0"
+rustc-demangle = "0.1.16"
+target-lexicon = { version = "0.10.0", default-features = false }
+wasmparser = "0.51.2"
+wasmtime-environ = { path = "../environ", version = "0.12.0" }
+wasmtime-jit = { path = "../jit", version = "0.12.0" }
+wasmtime-profiling = { path = "../profiling", version = "0.12.0" }
+wasmtime-runtime = { path = "../runtime", version = "0.12.0" }
 wat = { version = "1.0.10", optional = true }
+wit-parser = "0.1.1"
+wit-schema-version = "0.1"
+wit-validator = "0.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = "0.3.7"
 
 [dev-dependencies]
-# for wasmtime.rs
-wasi-common = { path = "../wasi-common", version = "0.12.0" }
+file-per-thread-logger = "0.1.1"
 pretty_env_logger = "0.3.0"
 rayon = "1.2.1"
-file-per-thread-logger = "0.1.1"
-wat = "1.0.10"
 tempfile = "3.1"
+wasi-common = { path = "../wasi-common", version = "0.12.0" }
+wat = "1.0.10"
+wit-text = "0.5"
 
 [badges]
 maintenance = { status = "actively-developed" }

crates/api/src/instance.rs

@@ -133,13 +133,17 @@ impl Instance {
 
         let mut exports = Vec::with_capacity(module.exports().len());
         for export in module.exports() {
-            let name = export.name().to_string();
-            let export = instance_handle.lookup(&name).expect("export");
-            exports.push(Extern::from_wasmtime_export(
-                store,
-                instance_handle.clone(),
-                export,
-            ));
+            let export = match module.inner.export_map[export.name()] {
+                crate::module::Export::Core => {
+                    let export = instance_handle.lookup(export.name()).expect("export");
+                    Extern::from_wasmtime_export(store, instance_handle.clone(), export)
+                }
+                crate::module::Export::Adapter(idx) => {
+                    let func = Module::adapter(module, instance_handle.clone(), idx);
+                    Extern::Func(func)
+                }
+            };
+            exports.push(export);
         }
         module.register_frame_info();
         Ok(Instance {