From 137e182750261fdaba787eae15fd8ad75161f225 Mon Sep 17 00:00:00 2001 From: Nick Fitzgerald Date: Fri, 22 May 2020 15:29:51 -0700 Subject: [PATCH] Update `wasmparser` to 0.57.0 --- Cargo.lock | 22 ++++++++++++++-------- cranelift/wasm/Cargo.toml | 2 +- cranelift/wasm/src/code_translator.rs | 4 ++++ crates/debug/Cargo.toml | 2 +- crates/environ/Cargo.toml | 2 +- crates/fuzzing/Cargo.toml | 2 +- crates/jit/Cargo.toml | 2 +- crates/lightbeam/Cargo.toml | 2 +- crates/wasmtime/Cargo.toml | 2 +- crates/wasmtime/src/runtime.rs | 1 + 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb823661f8..64665c28bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -579,7 +579,7 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.57.0", "wat", ] @@ -1114,7 +1114,7 @@ dependencies = [ "staticvec", "thiserror", "typemap", - "wasmparser", + "wasmparser 0.57.0", "wat", ] @@ -2151,6 +2151,12 @@ version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af931e2e1960c53f4a28b063fec4cacd036f35acbec8ff3a4739125b17382a87" +[[package]] +name = "wasmparser" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6" + [[package]] name = "wasmprinter" version = "0.2.5" @@ -2158,7 +2164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c93ba310101ec5ee980db66b47b3d276577c8310df1570e19994347137650454" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.55.0", ] [[package]] @@ -2175,7 +2181,7 @@ dependencies = [ "rustc-demangle", "target-lexicon", "tempfile", - "wasmparser", + "wasmparser 0.57.0", "wasmtime-environ", "wasmtime-jit", "wasmtime-profiling", @@ -2247,7 +2253,7 @@ dependencies = [ "more-asserts", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.57.0", "wasmtime-environ", ] @@ -2278,7 +2284,7 @@ dependencies = [ "tempfile", "thiserror", "toml", - "wasmparser", + "wasmparser 0.57.0", "winapi", "zstd", ] @@ -2307,7 +2313,7 @@ dependencies = [ "env_logger 0.7.1", "log", "rayon", - "wasmparser", + "wasmparser 0.57.0", "wasmprinter", "wasmtime", "wasmtime-wast", @@ -2331,7 +2337,7 @@ dependencies = [ "region", "target-lexicon", "thiserror", - "wasmparser", + "wasmparser 0.57.0", "wasmtime-debug", "wasmtime-environ", "wasmtime-profiling", diff --git a/cranelift/wasm/Cargo.toml b/cranelift/wasm/Cargo.toml index c92a13a269..ae5056effd 100644 --- a/cranelift/wasm/Cargo.toml +++ b/cranelift/wasm/Cargo.toml @@ -12,7 +12,7 @@ keywords = ["webassembly", "wasm"] edition = "2018" [dependencies] -wasmparser = { version = "0.55.0", default-features = false } +wasmparser = { version = "0.57.0", default-features = false } cranelift-codegen = { path = "../codegen", version = "0.63.0", default-features = false } cranelift-entity = { path = "../entity", version = "0.63.0" } cranelift-frontend = { path = "../frontend", version = "0.63.0", default-features = false } diff --git a/cranelift/wasm/src/code_translator.rs b/cranelift/wasm/src/code_translator.rs index 4e740b99e4..db9bef5983 100644 --- a/cranelift/wasm/src/code_translator.rs +++ b/cranelift/wasm/src/code_translator.rs @@ -1565,6 +1565,10 @@ pub fn translate_operator( | Operator::I32x4WidenHighI16x8U { .. } => { return Err(wasm_unsupported!("proposed SIMD operator {:?}", op)); } + + Operator::ReturnCall { .. } | Operator::ReturnCallIndirect { .. } => { + return Err(wasm_unsupported!("proposed tail-call operator {:?}", op)); + } }; Ok(()) } diff --git a/crates/debug/Cargo.toml b/crates/debug/Cargo.toml index 1e83b01b3c..6ef2dfc054 100644 --- a/crates/debug/Cargo.toml +++ b/crates/debug/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" [dependencies] gimli = "0.20.0" -wasmparser = "0.55.0" +wasmparser = "0.57.0" faerie = "0.15.0" wasmtime-environ = { path = "../environ", version = "0.16.0" } target-lexicon = { version = "0.10.0", default-features = false } diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml index 2d2db6a31e..79a2601deb 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.63.0", features = ["enable-serde"] } cranelift-entity = { path = "../../cranelift/entity", version = "0.63.0", features = ["enable-serde"] } cranelift-wasm = { path = "../../cranelift/wasm", version = "0.63.0", features = ["enable-serde"] } -wasmparser = "0.55.0" +wasmparser = "0.57.0" lightbeam = { path = "../lightbeam", optional = true, version = "0.16.0" } indexmap = "1.0.2" rayon = "1.2.1" diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml index 23bb8704d1..7af689724b 100644 --- a/crates/fuzzing/Cargo.toml +++ b/crates/fuzzing/Cargo.toml @@ -13,7 +13,7 @@ binaryen = { version = "0.10.0", optional = true } env_logger = "0.7.1" log = "0.4.8" rayon = "1.2.1" -wasmparser = "0.55.0" +wasmparser = "0.57.0" wasmprinter = "0.2.5" wasmtime = { path = "../wasmtime" } wasmtime-wast = { path = "../wast" } diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index 31ca4bc3b0..094330fbce 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -24,7 +24,7 @@ wasmtime-profiling = { path = "../profiling", version = "0.16.0" } region = "2.0.0" thiserror = "1.0.4" target-lexicon = { version = "0.10.0", default-features = false } -wasmparser = "0.55.0" +wasmparser = "0.57.0" more-asserts = "0.2.1" anyhow = "1.0" cfg-if = "0.1.9" diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml index 7e6acbabc0..50e73d7606 100644 --- a/crates/lightbeam/Cargo.toml +++ b/crates/lightbeam/Cargo.toml @@ -24,7 +24,7 @@ smallvec = "1.0.0" staticvec = "0.9" thiserror = "1.0.9" typemap = "0.3" -wasmparser = "0.55.0" +wasmparser = "0.57.0" [dev-dependencies] lazy_static = "1.2" diff --git a/crates/wasmtime/Cargo.toml b/crates/wasmtime/Cargo.toml index 4334f72a64..03d958721b 100644 --- a/crates/wasmtime/Cargo.toml +++ b/crates/wasmtime/Cargo.toml @@ -14,7 +14,7 @@ wasmtime-runtime = { path = "../runtime", version = "0.16.0" } wasmtime-environ = { path = "../environ", version = "0.16.0" } wasmtime-jit = { path = "../jit", version = "0.16.0" } wasmtime-profiling = { path = "../profiling", version = "0.16.0" } -wasmparser = "0.55.0" +wasmparser = "0.57.0" target-lexicon = { version = "0.10.0", default-features = false } anyhow = "1.0.19" region = "2.0.0" diff --git a/crates/wasmtime/src/runtime.rs b/crates/wasmtime/src/runtime.rs index 03a7c349d0..23168d8800 100644 --- a/crates/wasmtime/src/runtime.rs +++ b/crates/wasmtime/src/runtime.rs @@ -83,6 +83,7 @@ impl Config { enable_bulk_memory: false, enable_simd: false, enable_multi_value: true, + enable_tail_call: false, }, }, flags,