github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Bump wasm-tools dependencies (#9161) 

* Bump wasm-tools dependencies

This commit updates the wasm-tools dependencies to their 216 track of
versions. This will be followed-up with some updates to how some
features are managed.

* Update vets and depend on crates.io
pull/9166/head
Alex Crichton 3 months ago
committed by GitHub
parent
ff92e7afd1
commit
9d35545bf1
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
6 changed files with 194 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 174
      Cargo.lock
  2. 18
      Cargo.toml
  3. 1
      crates/wasmtime/src/config.rs
  4. 9
      crates/wasmtime/src/engine/serialization.rs
  5. 4
      crates/wit-bindgen/src/lib.rs
  6. 48
      supply-chain/imports.lock

174
Cargo.lock
View File

@ -851,7 +851,7 @@ dependencies = [
"serde_derive", "serde_derive",
"smallvec", "smallvec",
"target-lexicon", "target-lexicon",
"wasmparser", "wasmparser 0.216.0",
"wasmtime-types", "wasmtime-types",
"wat", "wat",
] ]
@ -2788,7 +2788,7 @@ dependencies = [
"cargo_metadata", "cargo_metadata",
"heck 0.4.0", "heck 0.4.0",
"wasmtime", "wasmtime",
"wit-component", "wit-component 0.216.0",
] ]
[[package]] [[package]]
@ -3116,7 +3116,7 @@ name = "verify-component-adapter"
version = "25.0.0" version = "25.0.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"wasmparser", "wasmparser 0.216.0",
"wat", "wat",
] ]
@ -3209,7 +3209,7 @@ dependencies = [
"byte-array-literals", "byte-array-literals",
"object", "object",
"wasi", "wasi",
"wasm-encoder", "wasm-encoder 0.216.0",
"wit-bindgen-rust-macro", "wit-bindgen-rust-macro",
] ]
@ -3274,7 +3274,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847" checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847"
dependencies = [ dependencies = [
"leb128", "leb128",
"wasmparser", "wasmparser 0.215.0",
]
[[package]]
name = "wasm-encoder"
version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
dependencies = [
"leb128",
"wasmparser 0.216.0",
] ]
[[package]] [[package]]
@ -3289,36 +3299,52 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"spdx", "spdx",
"wasm-encoder", "wasm-encoder 0.215.0",
"wasmparser", "wasmparser 0.215.0",
]
[[package]]
name = "wasm-metadata"
version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47c8154d703a6b0e45acf6bd172fa002fc3c7058a9f7615e517220aeca27c638"
dependencies = [
"anyhow",
"indexmap 2.2.6",
"serde",
"serde_derive",
"serde_json",
"spdx",
"wasm-encoder 0.216.0",
"wasmparser 0.216.0",
] ]
[[package]] [[package]]
name = "wasm-mutate" name = "wasm-mutate"
version = "0.215.0" version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "923d8899223f9e1365f851a960f864f4f2c9b631dbf8dceb86174e36295415d4" checksum = "17002e0f291e0c330a81b9285cf0e4e316e10e75b00d4f5c625d325f14582d11"
dependencies = [ dependencies = [
"egg", "egg",
"log", "log",
"rand", "rand",
"thiserror", "thiserror",
"wasm-encoder", "wasm-encoder 0.216.0",
"wasmparser", "wasmparser 0.216.0",
] ]
[[package]] [[package]]
name = "wasm-smith" name = "wasm-smith"
version = "0.215.0" version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fa72e06e213eca343cd3ce71eb78edd6fde947a22fc2288249ff64ef8197988" checksum = "b25e5a09d7934b471fb84ea864cc91ed1a4467ea8aaa32c09f60f3fb262e070e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arbitrary", "arbitrary",
"flagset", "flagset",
"indexmap 2.2.6", "indexmap 2.2.6",
"leb128", "leb128",
"wasm-encoder", "wasm-encoder 0.216.0",
] ]
[[package]] [[package]]
@ -3366,6 +3392,19 @@ name = "wasmparser"
version = "0.215.0" version = "0.215.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e" checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e"
dependencies = [
"ahash",
"bitflags 2.4.1",
"hashbrown 0.14.3",
"indexmap 2.2.6",
"semver",
]
[[package]]
name = "wasmparser"
version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3"
dependencies = [ dependencies = [
"ahash", "ahash",
"bitflags 2.4.1", "bitflags 2.4.1",
@ -3386,13 +3425,13 @@ dependencies = [
[[package]] [[package]]
name = "wasmprinter" name = "wasmprinter"
version = "0.215.0" version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8e9a325d85053408209b3d2ce5eaddd0dd6864d1cff7a007147ba073157defc" checksum = "8f82916f3892e53620639217d6ec78fe15c678352a3fbf3f3745b6417d0bd70f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"termcolor", "termcolor",
"wasmparser", "wasmparser 0.216.0",
] ]
[[package]] [[package]]
@ -3436,8 +3475,8 @@ dependencies = [
"target-lexicon", "target-lexicon",
"tempfile", "tempfile",
"wasi-common", "wasi-common",
"wasm-encoder", "wasm-encoder 0.216.0",
"wasmparser", "wasmparser 0.216.0",
"wasmtime-asm-macros", "wasmtime-asm-macros",
"wasmtime-cache", "wasmtime-cache",
"wasmtime-component-macro", "wasmtime-component-macro",
@ -3579,7 +3618,7 @@ dependencies = [
"tracing", "tracing",
"walkdir", "walkdir",
"wasi-common", "wasi-common",
"wasmparser", "wasmparser 0.216.0",
"wasmtime", "wasmtime",
"wasmtime-cache", "wasmtime-cache",
"wasmtime-cli-flags", "wasmtime-cli-flags",
@ -3595,10 +3634,10 @@ dependencies = [
"wasmtime-wasi-runtime-config", "wasmtime-wasi-runtime-config",
"wasmtime-wasi-threads", "wasmtime-wasi-threads",
"wasmtime-wast", "wasmtime-wast",
"wast 215.0.0", "wast 216.0.0",
"wat", "wat",
"windows-sys 0.52.0", "windows-sys 0.52.0",
"wit-component", "wit-component 0.216.0",
] ]
[[package]] [[package]]
@ -3631,7 +3670,7 @@ dependencies = [
"wasmtime", "wasmtime",
"wasmtime-component-util", "wasmtime-component-util",
"wasmtime-wit-bindgen", "wasmtime-wit-bindgen",
"wit-parser", "wit-parser 0.216.0",
] ]
[[package]] [[package]]
@ -3656,7 +3695,7 @@ dependencies = [
"smallvec", "smallvec",
"target-lexicon", "target-lexicon",
"thiserror", "thiserror",
"wasmparser", "wasmparser 0.216.0",
"wasmtime-environ", "wasmtime-environ",
"wasmtime-versioned-export-macros", "wasmtime-versioned-export-macros",
] ]
@ -3681,8 +3720,8 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"target-lexicon", "target-lexicon",
"wasm-encoder", "wasm-encoder 0.216.0",
"wasmparser", "wasmparser 0.216.0",
"wasmprinter", "wasmprinter",
"wasmtime-component-util", "wasmtime-component-util",
"wasmtime-types", "wasmtime-types",
@ -3697,7 +3736,7 @@ dependencies = [
"component-fuzz-util", "component-fuzz-util",
"env_logger", "env_logger",
"libfuzzer-sys", "libfuzzer-sys",
"wasmparser", "wasmparser 0.216.0",
"wasmprinter", "wasmprinter",
"wasmtime-environ", "wasmtime-environ",
"wat", "wat",
@ -3757,7 +3796,7 @@ dependencies = [
"rand", "rand",
"smallvec", "smallvec",
"target-lexicon", "target-lexicon",
"wasmparser", "wasmparser 0.216.0",
"wasmtime", "wasmtime",
"wasmtime-fuzzing", "wasmtime-fuzzing",
] ]
@ -3778,12 +3817,12 @@ dependencies = [
"target-lexicon", "target-lexicon",
"tempfile", "tempfile",
"v8", "v8",
"wasm-encoder", "wasm-encoder 0.216.0",
"wasm-mutate", "wasm-mutate",
"wasm-smith", "wasm-smith",
"wasm-spec-interpreter", "wasm-spec-interpreter",
"wasmi", "wasmi",
"wasmparser", "wasmparser 0.216.0",
"wasmprinter", "wasmprinter",
"wasmtime", "wasmtime",
"wasmtime-wast", "wasmtime-wast",
@ -3833,7 +3872,7 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"smallvec", "smallvec",
"wasmparser", "wasmparser 0.216.0",
] ]
[[package]] [[package]]
@ -3964,7 +4003,7 @@ dependencies = [
"anyhow", "anyhow",
"log", "log",
"wasmtime", "wasmtime",
"wast 215.0.0", "wast 216.0.0",
] ]
[[package]] [[package]]
@ -3976,7 +4015,7 @@ dependencies = [
"gimli", "gimli",
"object", "object",
"target-lexicon", "target-lexicon",
"wasmparser", "wasmparser 0.216.0",
"wasmtime-cranelift", "wasmtime-cranelift",
"wasmtime-environ", "wasmtime-environ",
"winch-codegen", "winch-codegen",
@ -3989,7 +4028,7 @@ dependencies = [
"anyhow", "anyhow",
"heck 0.4.0", "heck 0.4.0",
"indexmap 2.2.6", "indexmap 2.2.6",
"wit-parser", "wit-parser 0.216.0",
] ]
[[package]] [[package]]
@ -4007,24 +4046,24 @@ dependencies = [
[[package]] [[package]]
name = "wast" name = "wast"
version = "215.0.0" version = "216.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb" checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"leb128", "leb128",
"memchr", "memchr",
"unicode-width", "unicode-width",
"wasm-encoder", "wasm-encoder 0.216.0",
] ]
[[package]] [[package]]
name = "wat" name = "wat"
version = "1.215.0" version = "1.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d" checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a"
dependencies = [ dependencies = [
"wast 215.0.0", "wast 216.0.0",
] ]
[[package]] [[package]]
@ -4154,7 +4193,7 @@ dependencies = [
"regalloc2", "regalloc2",
"smallvec", "smallvec",
"target-lexicon", "target-lexicon",
"wasmparser", "wasmparser 0.216.0",
"wasmtime-cranelift", "wasmtime-cranelift",
"wasmtime-environ", "wasmtime-environ",
] ]
@ -4371,7 +4410,7 @@ checksum = "bb7e3df01cd43cfa1cb52602e4fc05cb2b62217655f6705639b6953eb0a3fed2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"heck 0.5.0", "heck 0.5.0",
"wit-parser", "wit-parser 0.215.0",
] ]
[[package]] [[package]]
@ -4394,9 +4433,9 @@ dependencies = [
"indexmap 2.2.6", "indexmap 2.2.6",
"prettyplease", "prettyplease",
"syn 2.0.60", "syn 2.0.60",
"wasm-metadata", "wasm-metadata 0.215.0",
"wit-bindgen-core", "wit-bindgen-core",
"wit-component", "wit-component 0.215.0",
] ]
[[package]] [[package]]
@ -4427,10 +4466,29 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"wasm-encoder", "wasm-encoder 0.215.0",
"wasm-metadata", "wasm-metadata 0.215.0",
"wasmparser", "wasmparser 0.215.0",
"wit-parser", "wit-parser 0.215.0",
]
[[package]]
name = "wit-component"
version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e2ca3ece38ea2447a9069b43074ba73d96dde1944cba276c54e41371745f9dc"
dependencies = [
"anyhow",
"bitflags 2.4.1",
"indexmap 2.2.6",
"log",
"serde",
"serde_derive",
"serde_json",
"wasm-encoder 0.216.0",
"wasm-metadata 0.216.0",
"wasmparser 0.216.0",
"wit-parser 0.216.0",
] ]
[[package]] [[package]]
@ -4448,7 +4506,25 @@ dependencies = [
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"unicode-xid", "unicode-xid",
"wasmparser", "wasmparser 0.215.0",
]
[[package]]
name = "wit-parser"
version = "0.216.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4d108165c1167a4ccc8a803dcf5c28e0a51d6739fd228cc7adce768632c764c"
dependencies = [
"anyhow",
"id-arena",
"indexmap 2.2.6",
"log",
"semver",
"serde",
"serde_derive",
"serde_json",
"unicode-xid",
"wasmparser 0.216.0",
] ]
[[package]] [[package]]

18
Cargo.toml
View File

@ -266,15 +266,15 @@ wit-bindgen = { version = "0.30.0", default-features = false }
wit-bindgen-rust-macro = { version = "0.30.0", default-features = false } wit-bindgen-rust-macro = { version = "0.30.0", default-features = false }
# wasm-tools family: # wasm-tools family:
wasmparser = { version = "0.215.0", default-features = false } wasmparser = { version = "0.216.0", default-features = false }
wat = "1.215.0" wat = "1.216.0"
wast = "215.0.0" wast = "216.0.0"
wasmprinter = "0.215.0" wasmprinter = "0.216.0"
wasm-encoder = "0.215.0" wasm-encoder = "0.216.0"
wasm-smith = "0.215.0" wasm-smith = "0.216.0"
wasm-mutate = "0.215.0" wasm-mutate = "0.216.0"
wit-parser = "0.215.0" wit-parser = "0.216.0"
wit-component = "0.215.0" wit-component = "0.216.0"
# Non-Bytecode Alliance maintained dependencies: # Non-Bytecode Alliance maintained dependencies:
# -------------------------- # --------------------------

1
crates/wasmtime/src/config.rs
View File

@ -1791,6 +1791,7 @@ impl Config {
// subject to the criteria at // subject to the criteria at
// https://docs.wasmtime.dev/contributing-implementing-wasm-proposals.html // https://docs.wasmtime.dev/contributing-implementing-wasm-proposals.html
features |= WasmFeatures::FLOATS; features |= WasmFeatures::FLOATS;
features |= WasmFeatures::GC_TYPES;
features |= WasmFeatures::MULTI_VALUE; features |= WasmFeatures::MULTI_VALUE;
features |= WasmFeatures::BULK_MEMORY; features |= WasmFeatures::BULK_MEMORY;
features |= WasmFeatures::SIGN_EXTENSION; features |= WasmFeatures::SIGN_EXTENSION;

9
crates/wasmtime/src/engine/serialization.rs
View File

@ -204,6 +204,7 @@ struct WasmFeatures {
custom_page_sizes: bool, custom_page_sizes: bool,
component_model_more_flags: bool, component_model_more_flags: bool,
component_model_multiple_returns: bool, component_model_multiple_returns: bool,
gc_types: bool,
} }
impl Metadata<'_> { impl Metadata<'_> {
@ -232,6 +233,7 @@ impl Metadata<'_> {
component_model_more_flags, component_model_more_flags,
component_model_multiple_returns, component_model_multiple_returns,
legacy_exceptions, legacy_exceptions,
gc_types,
// Always on; we don't currently have knobs for these. // Always on; we don't currently have knobs for these.
mutable_global: _, mutable_global: _,
@ -272,6 +274,7 @@ impl Metadata<'_> {
custom_page_sizes, custom_page_sizes,
component_model_more_flags, component_model_more_flags,
component_model_multiple_returns, component_model_multiple_returns,
gc_types,
}, },
} }
} }
@ -477,6 +480,7 @@ impl Metadata<'_> {
custom_page_sizes, custom_page_sizes,
component_model_more_flags, component_model_more_flags,
component_model_multiple_returns, component_model_multiple_returns,
gc_types,
} = self.features; } = self.features;
use wasmparser::WasmFeatures as F; use wasmparser::WasmFeatures as F;
@ -568,6 +572,11 @@ impl Metadata<'_> {
other.contains(F::COMPONENT_MODEL_MULTIPLE_RETURNS), other.contains(F::COMPONENT_MODEL_MULTIPLE_RETURNS),
"WebAssembly component model support for multiple returns", "WebAssembly component model support for multiple returns",
)?; )?;
Self::check_bool(
gc_types,
other.contains(F::GC_TYPES),
"support for WebAssembly gc types",
)?;
Ok(()) Ok(())
} }

4
crates/wit-bindgen/src/lib.rs
View File

@ -1781,12 +1781,12 @@ impl<'a> InterfaceGenerator<'a> {
uwriteln!( uwriteln!(
self.src, self.src,
"assert!({} == <{name} as {wt}::component::ComponentType>::SIZE32);", "assert!({} == <{name} as {wt}::component::ComponentType>::SIZE32);",
self.gen.sizes.size(&Type::Id(id)), self.gen.sizes.size(&Type::Id(id)).size_wasm32(),
); );
uwriteln!( uwriteln!(
self.src, self.src,
"assert!({} == <{name} as {wt}::component::ComponentType>::ALIGN32);", "assert!({} == <{name} as {wt}::component::ComponentType>::ALIGN32);",
self.gen.sizes.align(&Type::Id(id)), self.gen.sizes.align(&Type::Id(id)).align_wasm32(),
); );
self.push_str("};\n"); self.push_str("};\n");
} }

48
supply-chain/imports.lock
View File

@ -1098,6 +1098,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wasm-encoder]]
version = "0.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasm-metadata]] [[publisher.wasm-metadata]]
version = "0.214.0" version = "0.214.0"
when = "2024-07-16" when = "2024-07-16"
@ -1110,6 +1116,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wasm-metadata]]
version = "0.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmparser]] [[publisher.wasmparser]]
version = "0.214.0" version = "0.214.0"
when = "2024-07-16" when = "2024-07-16"
@ -1122,6 +1134,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wasmparser]]
version = "0.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmprinter]] [[publisher.wasmprinter]]
version = "0.214.0" version = "0.214.0"
when = "2024-07-16" when = "2024-07-16"
@ -1134,6 +1152,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wasmprinter]]
version = "0.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wasmtime]] [[publisher.wasmtime]]
version = "23.0.1" version = "23.0.1"
when = "2024-07-22" when = "2024-07-22"
@ -1296,6 +1320,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wast]]
version = "216.0.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wat]] [[publisher.wat]]
version = "1.214.0" version = "1.214.0"
when = "2024-07-16" when = "2024-07-16"
@ -1308,6 +1338,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wat]]
version = "1.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wiggle]] [[publisher.wiggle]]
version = "23.0.1" version = "23.0.1"
when = "2024-07-22" when = "2024-07-22"
@ -1609,6 +1645,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wit-component]]
version = "0.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.wit-parser]] [[publisher.wit-parser]]
version = "0.214.0" version = "0.214.0"
when = "2024-07-16" when = "2024-07-16"
@ -1621,6 +1663,12 @@ when = "2024-07-31"
user-id = 73222 user-id = 73222
user-login = "wasmtime-publish" user-login = "wasmtime-publish"
[[publisher.wit-parser]]
version = "0.216.0"
when = "2024-08-22"
user-id = 73222
user-login = "wasmtime-publish"
[[publisher.witx]] [[publisher.witx]]
version = "0.9.1" version = "0.9.1"
when = "2021-06-22" when = "2021-06-22"

Write Preview
Loading…
Cancel
Save