update to Wasmi v0.49.0 for differential fuzzer

Author: Robbepop

Cargo.lock

@@ -24,7 +24,7 @@ wasmtime = { workspace = true, optional = true, features = [
 wasm-smith = { workspace = true }
 wasmprinter = { workspace = true }
 wasmi-stack = { package = "wasmi", version = "0.31.2", features = ["std"], optional = true }
-wasmi-v048 = { package = "wasmi", version = "0.48.0", features = ["std", "simd", "extra-checks"], optional = true }
+wasmi-v049 = { package = "wasmi", version = "0.49.0", features = ["std", "simd", "extra-checks"], optional = true }
 arbitrary = "1.3.2"
 sha2 = "0.10"
 anyhow = "1.0.91"
@@ -33,7 +33,7 @@ anyhow = "1.0.91"
 default = []
 differential = [
     "dep:wasmi-stack",
-    "dep:wasmi-v048",
+    "dep:wasmi-v049",
     "dep:wasmtime",
 ]
 experimental-translator = [

crates/fuzz/Cargo.toml

@@ -2,7 +2,7 @@ pub use self::{
     exports::{ModuleExports, StringSequenceIter},
     wasmi::WasmiOracle,
     wasmi_stack::WasmiStackOracle,
-    wasmi_v048::WasmiV048Oracle,
+    wasmi_v049::WasmiV048Oracle,
     wasmtime::WasmtimeOracle,
 };
 use crate::{FuzzError, FuzzSmithConfig, FuzzVal};
@@ -11,7 +11,7 @@ use arbitrary::{Arbitrary, Unstructured};
 mod exports;
 mod wasmi;
 mod wasmi_stack;
-mod wasmi_v048;
+mod wasmi_v049;
 mod wasmtime;
 
 /// Trait implemented by differential fuzzing oracles.

crates/fuzz/src/oracle/mod.rs

@@ -4,16 +4,17 @@ use crate::{
     FuzzSmithConfig,
     FuzzVal,
 };
-use wasmi_v048::{
+use wasmi_v049::{
     core::{TrapCode, V128},
     Config,
     Engine,
     Error,
     ExternRef,
-    FuncRef,
+    Func,
     Instance,
     Linker,
     Module,
+    Ref,
     StackLimits,
     Store,
     StoreLimits,
@@ -63,10 +64,7 @@ impl DifferentialOracleMeta for WasmiV048Oracle {
         let mut store = Store::new(&engine, limiter);
         store.limiter(|lim| lim);
         let module = Module::new(store.engine(), wasm).unwrap();
-        let Ok(unstarted_instance) = linker.instantiate(&mut store, &module) else {
-            return None;
-        };
-        let Ok(instance) = unstarted_instance.ensure_no_start(&mut store) else {
+        let Ok(instance) = linker.instantiate_and_start(&mut store, &module) else {
             return None;
         };
         Some(Self {
@@ -129,11 +127,11 @@ impl From<FuzzVal> for Val {
             FuzzVal::V128(value) => Self::V128(V128::from(value)),
             FuzzVal::FuncRef { is_null } => {
                 assert!(is_null);
-                Self::FuncRef(FuncRef::null())
+                Self::FuncRef(<Ref<Func>>::Null)
             }
             FuzzVal::ExternRef { is_null } => {
                 assert!(is_null);
-                Self::ExternRef(ExternRef::null())
+                Self::ExternRef(<Ref<ExternRef>>::Null)
             }
         }
     }