f003388ec7
* 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.
146 lines
3.0 KiB
Plaintext
146 lines
3.0 KiB
Plaintext
;; functions
|
|
(module
|
|
(module $m
|
|
(func $foo (export "foo") (result i32)
|
|
i32.const 1)
|
|
)
|
|
(instance $a (instantiate $m))
|
|
|
|
(func (export "get") (result i32)
|
|
call $a.$foo)
|
|
)
|
|
(assert_return (invoke "get") (i32.const 1))
|
|
|
|
;; globals
|
|
(module
|
|
(module $m
|
|
(global $g (export "g") (mut i32) (i32.const 2))
|
|
)
|
|
(instance $a (instantiate $m))
|
|
|
|
(func (export "get") (result i32)
|
|
global.get $a.$g)
|
|
)
|
|
(assert_return (invoke "get") (i32.const 2))
|
|
|
|
;; memories
|
|
(module
|
|
(module $m
|
|
(memory $m (export "m") 1)
|
|
(data (i32.const 0) "\03\00\00\00")
|
|
)
|
|
(instance $a (instantiate $m))
|
|
(alias (instance $a) (memory $m))
|
|
|
|
(func (export "get") (result i32)
|
|
i32.const 0
|
|
i32.load)
|
|
)
|
|
(assert_return (invoke "get") (i32.const 3))
|
|
|
|
;; tables
|
|
(module
|
|
(module $m
|
|
(table $t (export "t") 1 funcref)
|
|
(func (result i32)
|
|
i32.const 4)
|
|
(elem (i32.const 0) 0)
|
|
)
|
|
(instance $a (instantiate $m))
|
|
|
|
(func (export "get") (result i32)
|
|
i32.const 0
|
|
call_indirect $a.$t (result i32))
|
|
)
|
|
(assert_return (invoke "get") (i32.const 4))
|
|
|
|
;; modules
|
|
(module
|
|
(module $m
|
|
(module $sub (export "module")
|
|
(func $f (export "") (result i32)
|
|
i32.const 5))
|
|
)
|
|
(instance $a (instantiate $m))
|
|
(instance $b (instantiate $a.$sub))
|
|
(alias $b.$f (instance $b) (func 0))
|
|
|
|
(func (export "get") (result i32)
|
|
call $b.$f)
|
|
)
|
|
(assert_return (invoke "get") (i32.const 5))
|
|
|
|
;; instances
|
|
(module
|
|
(module $m
|
|
(module $sub
|
|
(func $f (export "") (result i32)
|
|
i32.const 6))
|
|
(instance $i (export "") (instantiate $sub))
|
|
)
|
|
(instance $a (instantiate $m))
|
|
(alias $a.$i (instance $a) (instance 0))
|
|
(alias $a.$i.$f (instance $a.$i) (func 0))
|
|
|
|
(func (export "get") (result i32)
|
|
call $a.$i.$f)
|
|
)
|
|
(assert_return (invoke "get") (i32.const 6))
|
|
|
|
;; alias parent -- type
|
|
(module
|
|
(type $t (func))
|
|
(module $m
|
|
(func $f (type $t))
|
|
)
|
|
(instance $a (instantiate $m))
|
|
)
|
|
|
|
;; alias parent -- module
|
|
(module
|
|
(module $a)
|
|
(module $m
|
|
(instance (instantiate $a))
|
|
)
|
|
(instance (instantiate $m))
|
|
)
|
|
|
|
;; The alias, import, type, module, and instance sections can all be interleaved
|
|
(module
|
|
(module $a)
|
|
(type $t (func))
|
|
(module $m
|
|
;; alias
|
|
(alias $thunk parent (type $t))
|
|
;; import
|
|
(import "" "" (func (type $thunk)))
|
|
;; module (referencing parent type)
|
|
(module
|
|
(func (type $thunk))
|
|
)
|
|
;; type
|
|
(type $thunk2 (func))
|
|
;; module (referencing previous alias)
|
|
(module $m2
|
|
(func (export "") (type $thunk2))
|
|
)
|
|
;; instance
|
|
(instance $i (instantiate $m2))
|
|
;; alias that instance
|
|
(alias $my_f (instance $i) (func 0))
|
|
;; module
|
|
(module $m3
|
|
(import "" (func)))
|
|
;; use our aliased function to create the module
|
|
(instance $i2 (instantiate $m3 (func $my_f)))
|
|
;; module
|
|
(module $m4
|
|
(import "" (func)))
|
|
)
|
|
|
|
;; instantiate the above module
|
|
(module $smol (func $f (export "")))
|
|
(instance $smol (instantiate $smol))
|
|
(instance (instantiate $m (func $smol.$f)))
|
|
)
|