From c0c7851cb6294206ed959665644f1b0162b99827 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Mon, 4 Nov 2019 20:45:42 -0800
Subject: [PATCH] Fix fuzz build (#458)

Update to binaryen 0.8.1, as 0.5.0 doesn't build on current systems.

Update to match API changes in wasmtime and wasmparser.
---
 fuzz/Cargo.toml                             | 2 +-
 fuzz/fuzz_targets/instantiate.rs            | 6 +++---
 fuzz/fuzz_targets/instantiate_translated.rs | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 8aa197050c..43fc9228e4 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -16,7 +16,7 @@ cranelift-wasm = { version = "0.47", features = ["enable-serde"] }
 cranelift-native = { version = "0.47" }
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
 wasmparser = { version = "0.39.2", default-features = false }
-binaryen = "0.5.0"
+binaryen = "0.8.1"
 
 [features]
 default = ["wasmparser/core"]
diff --git a/fuzz/fuzz_targets/instantiate.rs b/fuzz/fuzz_targets/instantiate.rs
index 41a2539163..18d6852852 100644
--- a/fuzz/fuzz_targets/instantiate.rs
+++ b/fuzz/fuzz_targets/instantiate.rs
@@ -10,10 +10,10 @@ extern crate wasmtime_jit;
 
 use cranelift_codegen::settings;
 use wasmparser::validate;
-use wasmtime_jit::{instantiate, Compiler, NullResolver};
+use wasmtime_jit::{instantiate, CompilationStrategy, Compiler, NullResolver};
 
 fuzz_target!(|data: &[u8]| {
-    if !validate(data, None) {
+    if validate(data, None).is_err() {
         return;
     }
     let flag_builder = settings::builder();
@@ -21,7 +21,7 @@ fuzz_target!(|data: &[u8]| {
         panic!("host machine is not a supported target");
     });
     let isa = isa_builder.finish(settings::Flags::new(flag_builder));
-    let mut compiler = Compiler::new(isa);
+    let mut compiler = Compiler::new(isa, CompilationStrategy::Auto);
     let mut imports_resolver = NullResolver {};
     let _instance = instantiate(
         &mut compiler,
diff --git a/fuzz/fuzz_targets/instantiate_translated.rs b/fuzz/fuzz_targets/instantiate_translated.rs
index af6dfdd460..30e0a541c6 100644
--- a/fuzz/fuzz_targets/instantiate_translated.rs
+++ b/fuzz/fuzz_targets/instantiate_translated.rs
@@ -9,7 +9,7 @@ extern crate wasmtime_environ;
 extern crate wasmtime_jit;
 
 use cranelift_codegen::settings;
-use wasmtime_jit::{instantiate, Compiler, NullResolver};
+use wasmtime_jit::{instantiate, CompilationStrategy, Compiler, NullResolver};
 
 fuzz_target!(|data: &[u8]| {
     let binaryen_module = binaryen::tools::translate_to_fuzz_mvp(data);
@@ -19,7 +19,7 @@ fuzz_target!(|data: &[u8]| {
         panic!("host machine is not a supported target");
     });
     let isa = isa_builder.finish(settings::Flags::new(flag_builder));
-    let mut compiler = Compiler::new(isa);
+    let mut compiler = Compiler::new(isa, CompilationStrategy::Auto);
     let mut imports_resolver = NullResolver {};
     let _instance = instantiate(
         &mut compiler,