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

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 }
# wasm-tools family:
wasmparser = { version = "0.215.0", default-features = false }
wat = "1.215.0"
wast = "215.0.0"
wasmprinter = "0.215.0"
wasm-encoder = "0.215.0"
wasm-smith = "0.215.0"
wasm-mutate = "0.215.0"
wit-parser = "0.215.0"
wit-component = "0.215.0"
wasmparser = { version = "0.216.0", default-features = false }
wat = "1.216.0"
wast = "216.0.0"
wasmprinter = "0.216.0"
wasm-encoder = "0.216.0"
wasm-smith = "0.216.0"
wasm-mutate = "0.216.0"
wit-parser = "0.216.0"
wit-component = "0.216.0"
# Non-Bytecode Alliance maintained dependencies:
# --------------------------

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

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

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

@ -204,6 +204,7 @@ struct WasmFeatures {
custom_page_sizes: bool,
component_model_more_flags: bool,
component_model_multiple_returns: bool,
gc_types: bool,
}
impl Metadata<'_> {
@ -232,6 +233,7 @@ impl Metadata<'_> {
component_model_more_flags,
component_model_multiple_returns,
legacy_exceptions,
gc_types,
// Always on; we don't currently have knobs for these.
mutable_global: _,
@ -272,6 +274,7 @@ impl Metadata<'_> {
custom_page_sizes,
component_model_more_flags,
component_model_multiple_returns,
gc_types,
},
}
}
@ -477,6 +480,7 @@ impl Metadata<'_> {
custom_page_sizes,
component_model_more_flags,
component_model_multiple_returns,
gc_types,
} = self.features;
use wasmparser::WasmFeatures as F;
@ -568,6 +572,11 @@ impl Metadata<'_> {
other.contains(F::COMPONENT_MODEL_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(())
}

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

@ -1781,12 +1781,12 @@ impl<'a> InterfaceGenerator<'a> {
uwriteln!(
self.src,
"assert!({} == <{name} as {wt}::component::ComponentType>::SIZE32);",
self.gen.sizes.size(&Type::Id(id)),
self.gen.sizes.size(&Type::Id(id)).size_wasm32(),
);
uwriteln!(
self.src,
"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");
}

48
supply-chain/imports.lock
View File

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

Write Preview
Loading…
Cancel
Save