Update wasmparser and wast dependencies (#1663)

Brings in updates to SIMD spec ops renumbering.

Cargo.lock

@@ -1,11 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "adler32"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-
 [[package]]
 name = "ahash"
 version = "0.2.18"
@@ -856,18 +850,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "flate2"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42"
-dependencies = [
- "cfg-if",
- "crc32fast",
- "libc",
- "miniz_oxide",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -1150,15 +1132,6 @@ dependencies = [
  "autocfg 1.0.0",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
-dependencies = [
- "adler32",
-]
-
 [[package]]
 name = "more-asserts"
 version = "0.2.1"
@@ -1197,10 +1170,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5666bbb90bc4d1e5bdcb26c0afda1822d25928341e9384ab187a9b37ab69e36"
 dependencies = [
  "crc32fast",
- "flate2",
  "indexmap",
  "target-lexicon",
- "wasmparser",
 ]
 
 [[package]]
@@ -2061,15 +2032,15 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.51.4"
+version = "0.52.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
+checksum = "5ddb8b596eb158e19625ddfe56a4e74bd176313a75f8d9c1b5159dccff9bb073"
 
 [[package]]
 name = "wasmprinter"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd423d45b95fcee11775472bfdce66c63c45ada23c1b338e0a63d623a6c475b"
+checksum = "21c3ac16b1f882bf1e1ce007e4f194559d2e3332013367863ddfbc828d1f044f"
 dependencies = [
  "anyhow",
  "wasmparser",
@@ -2332,7 +2303,7 @@ version = "0.16.0"
 dependencies = [
  "anyhow",
  "wasmtime",
- "wast 14.0.0",
+ "wast 15.0.0",
 ]
 
 [[package]]
@@ -2346,20 +2317,20 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "14.0.0"
+version = "15.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17"
+checksum = "a10df5277f68adee65bba117b40235f07a4cb3d59e5ec9aa86dbee180fb1bc04"
 dependencies = [
  "leb128",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d"
+checksum = "526d28df6c047d9f9a92d4925b98afd8d8d95b1b3aa4f13eb1306f17d1da56c4"
 dependencies = [
- "wast 14.0.0",
+ "wast 15.0.0",
 ]
 
 [[package]]

build.rs

@@ -192,6 +192,11 @@ fn ignore(testsuite: &str, testname: &str, strategy: &str) -> bool {
             ("simd", "simd_load") => return true, // FIXME Unsupported feature: proposed SIMD operator I8x16Shl
             ("simd", "simd_splat") => return true, // FIXME Unsupported feature: proposed SIMD operator I8x16ShrS
 
+            // waiting for the upstream spec to get updated with new binary
+            // encodings of operations and for that to propagate to the
+            // testsuite repo.
+            ("simd", "simd_const") => return true,
+
             // Still working on implementing these. See #929.
             ("reference_types", "table_copy_on_imported_tables") => return false,
             ("reference_types", _) => return true,

cranelift/wasm/Cargo.toml

@@ -12,7 +12,7 @@ keywords = ["webassembly", "wasm"]
 edition = "2018"
 
 [dependencies]
-wasmparser = { version = "0.51.0", default-features = false }
+wasmparser = { version = "0.52.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 }

crates/api/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.51.2"
+wasmparser = "0.52.0"
 target-lexicon = { version = "0.10.0", default-features = false }
 anyhow = "1.0.19"
 region = "2.0.0"

crates/debug/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 
 [dependencies]
 gimli = "0.20.0"
-wasmparser = "0.51.2"
+wasmparser = "0.52.0"
 faerie = "0.15.0"
 wasmtime-environ = { path = "../environ", version = "0.16.0" }
 target-lexicon = { version = "0.10.0", default-features = false }

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.51.2"
+wasmparser = "0.52.0"
 lightbeam = { path = "../lightbeam", optional = true, version = "0.16.0" }
 indexmap = "1.0.2"
 rayon = "1.2.1"

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.51.2"
+wasmparser = "0.52.0"
 wasmprinter = "0.2.1"
 wasmtime = { path = "../api" }
 wasmtime-wast = { path = "../wast" }

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.51.2"
+wasmparser = "0.52.0"
 more-asserts = "0.2.1"
 anyhow = "1.0"
 cfg-if = "0.1.9"

crates/lightbeam/Cargo.toml

@@ -24,7 +24,7 @@ smallvec = "1.0.0"
 staticvec = "0.8"
 thiserror = "1.0.9"
 typemap = "0.3"
-wasmparser = "0.51.2"
+wasmparser = "0.52.0"
 
 [dev-dependencies]
 lazy_static = "1.2"

crates/lightbeam/src/backend.rs

@@ -5667,7 +5667,7 @@ impl<'this, M: ModuleContext> Context<'this, M> {
             slice = rest;
         }
 
-        mem::replace(&mut self.block_state.stack, stack);
+        self.block_state.stack = stack;
 
         Ok(())
     }

crates/profiling/Cargo.toml

@@ -16,7 +16,6 @@ cfg-if = "0.1"
 gimli = { version = "0.20.0", optional = true }
 lazy_static = "1.4"
 libc = { version = "0.2.60", default-features = false }
-object = { version = "0.18.0", optional = true }
 scroll = { version = "0.10.1", optional = true }
 serde = { version = "1.0.99", features = ["derive"] }
 target-lexicon = "0.10.0"
@@ -24,6 +23,12 @@ wasmtime-environ = { path = "../environ", version = "0.16.0" }
 wasmtime-runtime = { path = "../runtime", version = "0.16.0" }
 ittapi-rs = { version = "0.1.5", optional = true }
 
+[dependencies.object]
+version = "0.18.0"
+optional = true
+default-features = false
+features = ['read_core', 'elf', 'std']
+
 [badges]
 maintenance = { status = "actively-developed" }
 

crates/wast/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.19"
 wasmtime = { path = "../api", version = "0.16.0", default-features = false }
-wast = "14.0.0"
+wast = "15.0.0"
 
 [badges]
 maintenance = { status = "actively-developed" }