bugfixes

bytecodealliance · Jan 22, 2022 · 48153bf · 48153bf
1 parent c670b55
commit 48153bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/crates/environ/src/builtin.rs b/crates/environ/src/builtin.rs
@@ -19,7 +19,7 @@ macro_rules! foreach_builtin_function {
             /// Returns an index for wasm's `memory.init` instruction.
             memory_init(vmctx, i32, i32, i64, i32, i32) -> ();
             /// Returns a value for wasm's `ref.func` instruction.
-            ref_func(vmctx, i32) -> (reference);
+            ref_func(vmctx, i32) -> (pointer);
             /// Returns an index for wasm's `data.drop` instruction.
             data_drop(vmctx, i32) -> ();
             /// Returns an index for Wasm's `table.grow` instruction for `funcref`s.

diff --git a/crates/runtime/src/instance.rs b/crates/runtime/src/instance.rs
@@ -551,6 +551,7 @@ impl Instance {
                             ptr::null_mut()
                         } else {
                             debug_assert!(idx.as_u32() < self.offsets.num_defined_functions);
+                            self.get_caller_checked_anyfunc(*idx);  // Force lazy init
                             base.add(usize::try_from(idx.as_u32()).unwrap())
                         }
                     }),