T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fuzz build (#458)

Browse Source 
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.
This commit is contained in:
Josh Triplett
2019-11-04 20:45:42 -08:00
committed by Dan Gohman
parent bd60aa8b5e
commit c0c7851cb6
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fuzz/Cargo.toml
View File

@@ -16,7 +16,7 @@ cranelift-wasm = { version = "0.47", features = ["enable-serde"] }
cranelift-native = { version = "0.47" } cranelift-native = { version = "0.47" }
libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
wasmparser = { version = "0.39.2", default-features = false } wasmparser = { version = "0.39.2", default-features = false }
binaryen = "0.5.0" binaryen = "0.8.1"
[features] [features]
default = ["wasmparser/core"] default = ["wasmparser/core"]

6
fuzz/fuzz_targets/instantiate.rs
View File

@@ -10,10 +10,10 @@ extern crate wasmtime_jit;
use cranelift_codegen::settings; use cranelift_codegen::settings;
use wasmparser::validate; use wasmparser::validate;
use wasmtime_jit::{instantiate, Compiler, NullResolver}; use wasmtime_jit::{instantiate, CompilationStrategy, Compiler, NullResolver};
fuzz_target!(|data: &[u8]| { fuzz_target!(|data: &[u8]| {
if !validate(data, None) { if validate(data, None).is_err() {
return; return;
} }
let flag_builder = settings::builder(); let flag_builder = settings::builder();
@@ -21,7 +21,7 @@ fuzz_target!(|data: &[u8]| {
panic!("host machine is not a supported target"); panic!("host machine is not a supported target");
}); });
let isa = isa_builder.finish(settings::Flags::new(flag_builder)); 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 mut imports_resolver = NullResolver {};
let _instance = instantiate( let _instance = instantiate(
&mut compiler, &mut compiler,

4
fuzz/fuzz_targets/instantiate_translated.rs
View File

@@ -9,7 +9,7 @@ extern crate wasmtime_environ;
extern crate wasmtime_jit; extern crate wasmtime_jit;
use cranelift_codegen::settings; use cranelift_codegen::settings;
use wasmtime_jit::{instantiate, Compiler, NullResolver}; use wasmtime_jit::{instantiate, CompilationStrategy, Compiler, NullResolver};
fuzz_target!(|data: &[u8]| { fuzz_target!(|data: &[u8]| {
let binaryen_module = binaryen::tools::translate_to_fuzz_mvp(data); 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"); panic!("host machine is not a supported target");
}); });
let isa = isa_builder.finish(settings::Flags::new(flag_builder)); 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 mut imports_resolver = NullResolver {};
let _instance = instantiate( let _instance = instantiate(
&mut compiler, &mut compiler,