diff --git a/Cargo.lock b/Cargo.lock index 630be83fcd..0d202185e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -591,7 +591,7 @@ dependencies = [ "smallvec", "target-lexicon", "thiserror", - "wasmparser 0.70.0", + "wasmparser", "wat", ] @@ -1149,7 +1149,7 @@ dependencies = [ "smallvec", "thiserror", "typemap", - "wasmparser 0.70.0", + "wasmparser", "wat", ] @@ -2370,12 +2370,6 @@ dependencies = [ "parity-wasm", ] -[[package]] -name = "wasmparser" -version = "0.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1b3f9e9cf01a580b9f3281214dfdb1922b5dfb8494ee312ca03ae10036c2a2" - [[package]] name = "wasmparser" version = "0.71.0" @@ -2389,7 +2383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0515db67c610037f3c53ec36976edfd1eb01bac6b1226914b17ce609480e729f" dependencies = [ "anyhow", - "wasmparser 0.71.0", + "wasmparser", ] [[package]] @@ -2410,7 +2404,7 @@ dependencies = [ "smallvec", "target-lexicon", "tempfile", - "wasmparser 0.70.0", + "wasmparser", "wasmtime-cache", "wasmtime-environ", "wasmtime-jit", @@ -2499,7 +2493,7 @@ dependencies = [ "test-programs", "tracing-subscriber", "wasi-common", - "wasmparser 0.70.0", + "wasmparser", "wasmtime", "wasmtime-cache", "wasmtime-debug", @@ -2535,7 +2529,7 @@ dependencies = [ "object", "target-lexicon", "thiserror", - "wasmparser 0.70.0", + "wasmparser", "wasmtime-environ", ] @@ -2554,7 +2548,7 @@ dependencies = [ "more-asserts", "serde", "thiserror", - "wasmparser 0.70.0", + "wasmparser", ] [[package]] @@ -2583,7 +2577,7 @@ dependencies = [ "rayon", "wasm-smith", "wasmi", - "wasmparser 0.70.0", + "wasmparser", "wasmprinter", "wasmtime", "wasmtime-wast", @@ -2611,7 +2605,7 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmparser 0.70.0", + "wasmparser", "wasmtime-cranelift", "wasmtime-debug", "wasmtime-environ", @@ -2628,7 +2622,7 @@ version = "0.21.0" dependencies = [ "cranelift-codegen", "lightbeam", - "wasmparser 0.70.0", + "wasmparser", "wasmtime-environ", ] diff --git a/Cargo.toml b/Cargo.toml index ea08c6ea64..d111151e38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ libc = "0.2.60" log = "0.4.8" rayon = "1.2.1" humantime = "2.0.0" -wasmparser = "0.70.0" +wasmparser = "0.71.0" [dev-dependencies] env_logger = "0.8.1" diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml index 48e19a9d57..4a37c004d1 100644 --- a/cranelift/wasm/Cargo.toml +++ b/cranelift/wasm/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["webassembly", "wasm"] edition = "2018" [dependencies] -wasmparser = { version = "0.70", default-features = false } +wasmparser = { version = "0.71", default-features = false } cranelift-codegen = { path = "../codegen", version = "0.68.0", default-features = false } cranelift-entity = { path = "../entity", version = "0.68.0" } cranelift-frontend = { path = "../frontend", version = "0.68.0", default-features = false } diff --git a/cranelift/wasm/src/code_translator.rs b/cranelift/wasm/src/code_translator.rs index 2fe171842b..998a0c7417 100644 --- a/cranelift/wasm/src/code_translator.rs +++ b/cranelift/wasm/src/code_translator.rs @@ -1810,7 +1810,20 @@ pub fn translate_operator( let (a, b) = pop2_with_bitcast(state, I16X8, builder); state.push1(builder.ins().widening_pairwise_dot_product_s(a, b)); } - + Operator::I16x8ExtMulLowI8x16S + | Operator::I16x8ExtMulHighI8x16S + | Operator::I16x8ExtMulLowI8x16U + | Operator::I16x8ExtMulHighI8x16U + | Operator::I32x4ExtMulLowI16x8S + | Operator::I32x4ExtMulHighI16x8S + | Operator::I32x4ExtMulLowI16x8U + | Operator::I32x4ExtMulHighI16x8U + | Operator::I64x2ExtMulLowI32x4S + | Operator::I64x2ExtMulHighI32x4S + | Operator::I64x2ExtMulLowI32x4U + | Operator::I64x2ExtMulHighI32x4U => { + return Err(wasm_unsupported!("proposed simd operator {:?}", op)); + } Operator::ReturnCall { .. } | Operator::ReturnCallIndirect { .. } => { return Err(wasm_unsupported!("proposed tail-call operator {:?}", op)); } diff --git a/crates/debug/Cargo.toml b/crates/debug/Cargo.toml index 2236666c2a..c893c9ab13 100644 --- a/crates/debug/Cargo.toml +++ b/crates/debug/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [dependencies] gimli = "0.23.0" -wasmparser = "0.70" +wasmparser = "0.71" object = { version = "0.22.0", default-features = false, features = ["read_core", "elf", "write"] } wasmtime-environ = { path = "../environ", version = "0.21.0" } target-lexicon = { version = "0.11.0", default-features = false } diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml index 26b0ec0eaf..aa132a340f 100644 --- a/crates/environ/Cargo.toml +++ b/crates/environ/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1.0" cranelift-codegen = { path = "../../cranelift/codegen", version = "0.68.0", features = ["enable-serde"] } cranelift-entity = { path = "../../cranelift/entity", version = "0.68.0", features = ["enable-serde"] } cranelift-wasm = { path = "../../cranelift/wasm", version = "0.68.0", features = ["enable-serde"] } -wasmparser = "0.70" +wasmparser = "0.71" indexmap = { version = "1.0.2", features = ["serde-1"] } thiserror = "1.0.4" serde = { version = "1.0.94", features = ["derive"] } diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml index c4b13a2589..3d77683437 100644 --- a/crates/fuzzing/Cargo.toml +++ b/crates/fuzzing/Cargo.toml @@ -13,7 +13,7 @@ arbitrary = { version = "0.4.1", features = ["derive"] } env_logger = "0.8.1" log = "0.4.8" rayon = "1.2.1" -wasmparser = "0.70" +wasmparser = "0.71" wasmprinter = "0.2.17" wasmtime = { path = "../wasmtime" } wasmtime-wast = { path = "../wast" } diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index c754126d92..7b578543b7 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -28,7 +28,7 @@ rayon = { version = "1.0", optional = true } region = "2.1.0" thiserror = "1.0.4" target-lexicon = { version = "0.11.0", default-features = false } -wasmparser = "0.70" +wasmparser = "0.71" more-asserts = "0.2.1" anyhow = "1.0" cfg-if = "1.0" diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml index d178090cfa..65ad3ba751 100644 --- a/crates/lightbeam/Cargo.toml +++ b/crates/lightbeam/Cargo.toml @@ -24,7 +24,7 @@ more-asserts = "0.2.1" smallvec = "1.0.0" thiserror = "1.0.9" typemap = "0.3" -wasmparser = "0.70" +wasmparser = "0.71" [dev-dependencies] lazy_static = "1.2" diff --git a/crates/lightbeam/wasmtime/Cargo.toml b/crates/lightbeam/wasmtime/Cargo.toml index 41b47115ee..51b0900b50 100644 --- a/crates/lightbeam/wasmtime/Cargo.toml +++ b/crates/lightbeam/wasmtime/Cargo.toml @@ -13,6 +13,6 @@ edition = "2018" [dependencies] lightbeam = { path = "..", version = "0.21.0" } -wasmparser = "0.70" +wasmparser = "0.71" cranelift-codegen = { path = "../../../cranelift/codegen", version = "0.68.0" } wasmtime-environ = { path = "../../environ", version = "0.21.0" } diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml index 1fa4f012f4..9f22c01c40 100644 --- a/crates/wasmtime/Cargo.toml +++ b/crates/wasmtime/Cargo.toml @@ -16,7 +16,7 @@ wasmtime-jit = { path = "../jit", version = "0.21.0" } wasmtime-cache = { path = "../cache", version = "0.21.0", optional = true } wasmtime-profiling = { path = "../profiling", version = "0.21.0" } target-lexicon = { version = "0.11.0", default-features = false } -wasmparser = "0.70" +wasmparser = "0.71" anyhow = "1.0.19" region = "2.2.0" libc = "0.2"