Merge pull request #3443 from manunio/fix-fuzz-errors

Fix fuzz errors
wasmerio · Jan 2, 2023 · e531c7a · e531c7a
2 parents 30f0183 + 5542cf0
commit e531c7a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/fuzz/fuzz_targets/deterministic.rs b/fuzz/fuzz_targets/deterministic.rs
@@ -46,7 +46,7 @@ fuzz_target!(|module: ConfiguredModule<NoImportsConfig>| {
     compiler.enable_verifier();
     compile_and_compare(
         "universal-cranelift",
-        EngineBuilder::new(compiler.clone()),
+        EngineBuilder::new(compiler.clone()).engine(),
         &wasm_bytes,
     );
 
@@ -55,14 +55,14 @@ fuzz_target!(|module: ConfiguredModule<NoImportsConfig>| {
     compiler.enable_verifier();
     compile_and_compare(
         "universal-llvm",
-        EngineBuilder::new(compiler.clone()),
+        EngineBuilder::new(compiler.clone()).engine(),
         &wasm_bytes,
     );
 
     let compiler = Singlepass::default();
     compile_and_compare(
         "universal-singlepass",
-        EngineBuilder::new(compiler.clone()),
+        EngineBuilder::new(compiler.clone()).engine(),
         &wasm_bytes,
     );
 });
diff --git a/fuzz/fuzz_targets/metering.rs b/fuzz/fuzz_targets/metering.rs
@@ -4,7 +4,7 @@ use libfuzzer_sys::{arbitrary, arbitrary::Arbitrary, fuzz_target};
 use std::sync::Arc;
 use wasm_smith::{Config, ConfiguredModule};
 use wasmer::wasmparser::Operator;
-use wasmer::{imports, CompilerConfig, EngineBuilder, Instance, Module, Store};
+use wasmer::{imports, CompilerConfig, Instance, Module, Store};
 use wasmer_compiler_cranelift::Cranelift;
 use wasmer_middlewares::Metering;
 
@@ -57,7 +57,7 @@ fuzz_target!(|module: WasmSmithModule| {
     compiler.push_middleware(metering);
     let mut store = Store::new(compiler);
     let module = Module::new(&store, &wasm_bytes).unwrap();
-    match Instance::new(&module, &imports! {}) {
+    match Instance::new(&mut store, &module, &imports! {}) {
         Ok(_) => {}
         Err(e) => {
             let error_message = format!("{}", e);

diff --git a/fuzz/fuzz_targets/universal_llvm.rs b/fuzz/fuzz_targets/universal_llvm.rs
@@ -2,7 +2,7 @@
 
 use libfuzzer_sys::{arbitrary, arbitrary::Arbitrary, fuzz_target};
 use wasm_smith::{Config, ConfiguredModule};
-use wasmer::{imports, CompilerConfig, EngineBuilder, Instance, Module, Store};
+use wasmer::{imports, CompilerConfig, Instance, Module, Store};
 use wasmer_compiler_llvm::LLVM;
 
 #[derive(Arbitrary, Debug, Default, Copy, Clone)]
@@ -43,7 +43,7 @@ fuzz_target!(|module: WasmSmithModule| {
     compiler.enable_verifier();
     let mut store = Store::new(compiler);
     let module = Module::new(&store, &wasm_bytes).unwrap();
-    match Instance::new(&module, &imports! {}) {
+    match Instance::new(&mut store, &module, &imports! {}) {
         Ok(_) => {}
         Err(e) => {
             let error_message = format!("{}", e);

diff --git a/fuzz/fuzz_targets/universal_singlepass.rs b/fuzz/fuzz_targets/universal_singlepass.rs
@@ -2,7 +2,7 @@
 
 use libfuzzer_sys::{arbitrary, arbitrary::Arbitrary, fuzz_target};
 use wasm_smith::{Config, ConfiguredModule};
-use wasmer::{imports, EngineBuilder, Instance, Module, Store};
+use wasmer::{imports, Instance, Module, Store};
 use wasmer_compiler_singlepass::Singlepass;
 
 #[derive(Arbitrary, Debug, Default, Copy, Clone)]
@@ -51,7 +51,7 @@ fuzz_target!(|module: WasmSmithModule| {
             panic!("{}", e);
         }
     };
-    match Instance::new(&module, &imports! {}) {
+    match Instance::new(&mut store, &module, &imports! {}) {
         Ok(_) => {}
         Err(e) => {
             let error_message = format!("{}", e);