Merge with upstream

.github/workflows/main.yml

@@ -119,6 +119,11 @@ jobs:
       - run: cargo check --no-default-features --features metadata
       - run: cargo check --no-default-features --features wit-smith
       - run: cargo check --no-default-features --features addr2line
+      - run: |
+          if cargo tree -p wasm-smith --no-default-features -e no-dev | grep wasmparser; then
+            echo wasm-smith without default features should not depend on wasmparser
+            exit 1
+          fi
 
   doc:
     runs-on: ubuntu-latest

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-tools"
-version = "1.0.55"
+version = "1.0.56"
 authors = ["The Wasmtime Project Developers"]
 edition.workspace = true
 description = "CLI tools for interoperating with WebAssembly files"
@@ -47,19 +47,19 @@ pretty_assertions = "1.3.0"
 semver = "1.0.0"
 smallvec = "1.11.1"
 
-wasm-compose = { version = "0.5.0", path = "crates/wasm-compose" }
-wasm-encoder = { version = "0.39.0", path = "crates/wasm-encoder" }
-wasm-metadata = { version = "0.10.15", path = "crates/wasm-metadata" }
-wasm-mutate = { version = "0.2.44", path = "crates/wasm-mutate" }
-wasm-shrink = { version = "0.1.45", path = "crates/wasm-shrink" }
-wasm-smith = { version = "0.14.0", path = "crates/wasm-smith" }
-wasmparser = { version = "0.119.0", path = "crates/wasmparser" }
-wasmprinter = { version = "0.2.76", path = "crates/wasmprinter" }
-wast = { version = "70.0.0", path = "crates/wast" }
-wat = { version = "1.0.83", path = "crates/wat" }
-wit-component = { version = "0.19.1", path = "crates/wit-component" }
+wasm-compose = { version = "0.5.1", path = "crates/wasm-compose" }
+wasm-encoder = { version = "0.40.0", path = "crates/wasm-encoder" }
+wasm-metadata = { version = "0.10.16", path = "crates/wasm-metadata" }
+wasm-mutate = { version = "0.2.45", path = "crates/wasm-mutate" }
+wasm-shrink = { version = "0.1.46", path = "crates/wasm-shrink" }
+wasm-smith = { version = "0.15.0", path = "crates/wasm-smith" }
+wasmparser = { version = "0.120.0", path = "crates/wasmparser" }
+wasmprinter = { version = "0.2.77", path = "crates/wasmprinter" }
+wast = { version = "70.0.1", path = "crates/wast" }
+wat = { version = "1.0.84", path = "crates/wat" }
+wit-component = { version = "0.20.0", path = "crates/wit-component" }
 wit-parser = { version = "0.13.1", path = "crates/wit-parser" }
-wit-smith = { version = "0.1.25", path = "crates/wit-smith" }
+wit-smith = { version = "0.1.26", path = "crates/wit-smith" }
 
 [dependencies]
 anyhow = { workspace = true }

crates/fuzz-stats/src/bin/failed-instantiations.rs

@@ -103,7 +103,7 @@ impl State {
         config.allow_start_export = false;
 
         // Wasmtime doesn't support this proposal yet.
-        config.tail_call_enabled = false;
+        config.gc_enabled = false;
 
         let mut wasm = wasm_smith::Module::new(config, &mut u)?;
         wasm.ensure_termination(10_000);

crates/wasm-compose/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-compose"
-version = "0.5.0"
+version = "0.5.1"
 edition.workspace = true
 authors = ["Peter Huene <[email protected]>"]
 license = "Apache-2.0 WITH LLVM-exception"

crates/wasm-encoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm-encoder"
-version = "0.39.0"
+version = "0.40.0"
 authors = ["Nick Fitzgerald <[email protected]>"]
 edition.workspace = true
 license = "Apache-2.0 WITH LLVM-exception"

crates/wasm-encoder/src/core/code.rs

@@ -1632,8 +1632,8 @@ impl Encode for Instruction<'_> {
                 sink.push(0x18);
                 let cast_flags =
                     (from_ref_type.nullable as u8) | ((to_ref_type.nullable as u8) << 1);
-                relative_depth.encode(sink);
                 sink.push(cast_flags);
+                relative_depth.encode(sink);
                 from_ref_type.heap_type.encode(sink);
                 to_ref_type.heap_type.encode(sink);
             }
@@ -1646,8 +1646,8 @@ impl Encode for Instruction<'_> {
                 sink.push(0x19);
                 let cast_flags =
                     (from_ref_type.nullable as u8) | ((to_ref_type.nullable as u8) << 1);
-                relative_depth.encode(sink);
                 sink.push(cast_flags);
+                relative_depth.encode(sink);
                 from_ref_type.heap_type.encode(sink);
                 to_ref_type.heap_type.encode(sink);
             }