Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Update wasm-tools, remove `cancellable` from component model intrinsics (#14244)

Alex Crichtonb016297de18a
diff --git a/Cargo.lock b/Cargo.lock
index 4e6c230d18..518c226bd3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,7 +161,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -220,13 +220,13 @@ dependencies = [
"clang-sys",
"itertools 0.13.0",
"log",
- "prettyplease",
+ "prettyplease 0.2.31",
"proc-macro2",
"quote",
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -538,7 +538,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -584,7 +584,7 @@ dependencies = [
"test-programs-artifacts",
"tokio",
"wasm-compose",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime",
"wasmtime-wasi",
]
@@ -922,7 +922,7 @@ version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
]
[[package]]
@@ -1167,7 +1167,7 @@ checksum = "d475dfebcb4854d596b17b09f477616f80f17a550517f2b3615d8c205d5c802b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -1210,7 +1210,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -1348,7 +1348,7 @@ dependencies = [
name = "example-component-wasm"
version = "0.0.0"
dependencies = [
- "wit-bindgen 0.61.1",
+ "wit-bindgen 0.62.0",
]
[[package]]
@@ -1359,7 +1359,7 @@ version = "0.0.0"
name = "example-resource-component-wasm"
version = "0.1.0"
dependencies = [
- "wit-bindgen 0.61.1",
+ "wit-bindgen 0.62.0",
]
[[package]]
@@ -1370,12 +1370,6 @@ version = "0.0.0"
name = "example-wasi-wasm"
version = "0.0.0"
-[[package]]
-name = "fallible-iterator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-
[[package]]
name = "fastrand"
version = "1.9.0"
@@ -1588,7 +1582,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -1711,20 +1705,27 @@ name = "gimli"
version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
+
+[[package]]
+name = "gimli"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf7f043f89559805f8c7cacc432749b2fa0d0a0a9ee46ce47164ed5ba7f126c"
dependencies = [
- "fallible-iterator",
+ "fnv",
+ "hashbrown 0.16.1",
"indexmap 2.14.0",
"stable_deref_trait",
]
[[package]]
name = "gimli"
-version = "0.33.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7f043f89559805f8c7cacc432749b2fa0d0a0a9ee46ce47164ed5ba7f126c"
+checksum = "1033caf0b349c518623b5396bfb2cf0bddf44f0306d543a250e5743297aafd10"
dependencies = [
"fnv",
- "hashbrown 0.16.1",
+ "hashbrown 0.17.0",
"indexmap 2.14.0",
"stable_deref_trait",
]
@@ -2030,7 +2031,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -2219,14 +2220,14 @@ dependencies = [
[[package]]
name = "json-from-wast"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74cef75a485ea9c18b6f7c1928bda2ef3a5727227fe7ebab4260626bc75f98e"
+checksum = "7a27a2a28655413fb7a515592b0b2b79631c0a34ea51122603320664d6de395c"
dependencies = [
"anyhow",
"serde",
"serde_derive",
- "wast 258.0.0",
+ "wast 259.0.0",
]
[[package]]
@@ -2317,18 +2318,18 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
[[package]]
name = "logos"
-version = "0.14.2"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c6b6e02facda28ca5fb8dbe4b152496ba3b1bd5a4b40bb2b1b2d8ad74e0f39b"
+checksum = "ff472f899b4ec2d99161c51f60ff7075eeb3097069a36050d8037a6325eb8154"
dependencies = [
"logos-derive",
]
[[package]]
name = "logos-codegen"
-version = "0.14.2"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32eb6b5f26efacd015b000bfc562186472cd9b34bdba3f6b264e2a052676d10"
+checksum = "192a3a2b90b0c05b27a0b2c43eecdb7c415e29243acc3f89cc8247a5b693045c"
dependencies = [
"beef",
"fnv",
@@ -2336,14 +2337,15 @@ dependencies = [
"proc-macro2",
"quote",
"regex-syntax 0.8.5",
- "syn",
+ "rustc_version",
+ "syn 2.0.106",
]
[[package]]
name = "logos-derive"
-version = "0.14.2"
+version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5d0c5463c911ef55624739fc353238b4e310f0144be1f875dc42fec6bfd5ec"
+checksum = "605d9697bcd5ef3a42d38efc51541aa3d6a4a25f7ab6d1ed0da5ac632a26b470"
dependencies = [
"logos-codegen",
]
@@ -2365,13 +2367,13 @@ checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
[[package]]
name = "macro-string"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a9dbbfc75d2688ed057456ce8a3ee3f48d12eec09229f560f3643b9f275653"
+checksum = "6e7b3a5bbb2f63aaa223a671ea1bd0e7bc16bd30ce387324cf63995deaddbbd2"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
]
[[package]]
@@ -2484,7 +2486,7 @@ checksum = "1a3c893cbc8cc5b87607ed340786512781aff5d8d7ede9f43a82464f5c7c2390"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -2679,7 +2681,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -2851,7 +2853,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -2923,7 +2925,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0"
+dependencies = [
+ "proc-macro2",
+ "syn 3.0.5",
]
[[package]]
@@ -2984,7 +2996,7 @@ version = "50.0.0-dev"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
]
[[package]]
@@ -3256,6 +3268,15 @@ version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
[[package]]
name = "rustix"
version = "0.38.43"
@@ -3439,7 +3460,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -3657,6 +3678,17 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "syn"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
[[package]]
name = "synstructure"
version = "0.13.1"
@@ -3665,7 +3697,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -3758,7 +3790,7 @@ checksum = "451b374529930d7601b1eef8d32bc79ae870b6079b069401709c2a8bf9e75f36"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -3776,7 +3808,7 @@ dependencies = [
"wasi-nn",
"wasip1",
"wasip2",
- "wit-bindgen 0.61.1",
+ "wit-bindgen 0.62.0",
]
[[package]]
@@ -3791,7 +3823,7 @@ dependencies = [
"wasmtime",
"wasmtime-test-util",
"wat",
- "wit-component 0.258.0",
+ "wit-component 0.259.0",
]
[[package]]
@@ -3820,7 +3852,7 @@ checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -3831,7 +3863,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -3906,7 +3938,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -4037,7 +4069,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -4258,7 +4290,7 @@ name = "verify-component-adapter"
version = "50.0.0-dev"
dependencies = [
"anyhow",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wat",
]
@@ -4335,8 +4367,8 @@ dependencies = [
"byte-array-literals",
"object 0.40.0",
"wasip1",
- "wasm-encoder 0.258.0",
- "wit-bindgen-rust-macro 0.61.1",
+ "wasm-encoder 0.259.0",
+ "wit-bindgen-rust-macro 0.62.0",
]
[[package]]
@@ -4365,18 +4397,17 @@ dependencies = [
[[package]]
name = "wasm-compose"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd08e5283f98238f2f16f5f978188a33af9901b81186bb549faad306a7b5388"
+checksum = "8aea3892e99cd163b7ac32984bbd434328928d63a9305ef1c55b1de3a42ae530"
dependencies = [
"anyhow",
- "heck",
"indexmap 2.14.0",
"log",
"petgraph",
"smallvec 1.15.1",
- "wasm-encoder 0.258.0",
- "wasmparser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasmparser 0.259.0",
"wat",
]
@@ -4392,12 +4423,12 @@ dependencies = [
[[package]]
name = "wasm-encoder"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e974fe6821a8cf64575d51ea2194e2c8f77e7b66e9afe7419ce8a97f9ee0d251"
+checksum = "b1d0246511d901aacf25d2dc9111f0054947de5e093fe662099e709ff7530dc3"
dependencies = [
"leb128fmt",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
]
[[package]]
@@ -4414,42 +4445,42 @@ dependencies = [
[[package]]
name = "wasm-metadata"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a11585adb92fe9b55ad1d760e8d8fb5d87e0d2e303cb8eed57f078d54293a2"
+checksum = "4e7bf119eb01f4a246864c10bd87c8f26c566350abb25aa4d5273c415bbab338"
dependencies = [
"anyhow",
"indexmap 2.14.0",
- "wasm-encoder 0.258.0",
- "wasmparser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasmparser 0.259.0",
]
[[package]]
name = "wasm-mutate"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ae9cac04ab7c539efa6b4288726ced0d423c95f1bb63659d74506142ff0499b"
+checksum = "71051ca415c103603a5b92b58a87f559da36dde72a43427c48838cbd9ab24977"
dependencies = [
"egg",
"log",
"rand 0.10.1",
"thiserror 2.0.17",
- "wasm-encoder 0.258.0",
- "wasmparser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasmparser 0.259.0",
]
[[package]]
name = "wasm-smith"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a84b31d645ea084a94e1a7c410e30219c165a0960b336f535f99162caf2cfd0c"
+checksum = "8790c064265f6d6cdaa30a2e53ccb779a3d157a16286640a4b0d64d6e7df3aa4"
dependencies = [
"anyhow",
"arbitrary",
"flagset",
"serde",
"serde_derive",
- "wasm-encoder 0.258.0",
+ "wasm-encoder 0.259.0",
"wat",
]
@@ -4463,14 +4494,14 @@ dependencies = [
[[package]]
name = "wasm-wave"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1d8cbc89bc22dac012f5fd56fca419330cb88d8d2c8f6ccb313f08ec4a6836"
+checksum = "583b7203d031ad7b426e12147042e49bc6abee8dfce21f76ceefcaa4121aae09"
dependencies = [
"anyhow",
"logos",
"thiserror 2.0.17",
- "wit-parser 0.258.0",
+ "wit-parser 0.259.0",
]
[[package]]
@@ -4537,9 +4568,9 @@ dependencies = [
[[package]]
name = "wasmparser"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9a61719f93a87b16d325921e251800c4833f8fab50fa21c7de73aed50086313"
+checksum = "0f7c12eac7bb587801590f6a67ff0bc84d0748513864b71108e4b311cc3df694"
dependencies = [
"bitflags 2.11.1",
"hashbrown 0.17.0",
@@ -4550,13 +4581,13 @@ dependencies = [
[[package]]
name = "wasmprinter"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a65e30fb2cd3cc5cb7761a6064787b2abf017e6566d8d0dedf2bb7f55ad5383"
+checksum = "0510ce2ff0ad7c5510ad3dfcb2cedba4cf5d9f7e08d1d06e4d8cf8e5638aef95"
dependencies = [
"anyhow",
"termcolor",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
]
[[package]]
@@ -4598,9 +4629,9 @@ dependencies = [
"tempfile",
"tokio",
"wasm-compose",
- "wasm-encoder 0.258.0",
+ "wasm-encoder 0.259.0",
"wasm-wave",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime-environ",
"wasmtime-internal-cache",
"wasmtime-internal-component-macro",
@@ -4617,7 +4648,7 @@ dependencies = [
"wasmtime-test-util",
"wat",
"windows-sys 0.61.2",
- "wit-parser 0.258.0",
+ "wit-parser 0.259.0",
]
[[package]]
@@ -4708,8 +4739,8 @@ dependencies = [
"toml",
"tracing",
"walkdir",
- "wasm-encoder 0.258.0",
- "wasmparser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasmparser 0.259.0",
"wasmprinter",
"wasmtime",
"wasmtime-cli-flags",
@@ -4731,10 +4762,10 @@ dependencies = [
"wasmtime-wasi-tls",
"wasmtime-wast",
"wasmtime-wizer",
- "wast 258.0.0",
+ "wast 259.0.0",
"wat",
"windows-sys 0.61.2",
- "wit-component 0.258.0",
+ "wit-component 0.259.0",
]
[[package]]
@@ -4777,8 +4808,8 @@ dependencies = [
"sha2",
"smallvec 1.15.1",
"target-lexicon 0.13.5",
- "wasm-encoder 0.258.0",
- "wasmparser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasmparser 0.259.0",
"wasmprinter",
"wasmtime-internal-component-util",
"wasmtime-internal-core",
@@ -4792,7 +4823,7 @@ dependencies = [
"arbitrary",
"env_logger 0.11.5",
"libfuzzer-sys",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmprinter",
"wasmtime-environ",
"wasmtime-test-util",
@@ -4824,7 +4855,7 @@ dependencies = [
"rand 0.10.1",
"smallvec 1.15.1",
"target-lexicon 0.13.5",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime",
"wasmtime-fuzzing",
"wasmtime-internal-core",
@@ -4852,12 +4883,12 @@ dependencies = [
"tempfile",
"tokio",
"v8",
- "wasm-encoder 0.258.0",
+ "wasm-encoder 0.259.0",
"wasm-mutate",
"wasm-smith",
"wasm-spec-interpreter",
"wasmi",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmprinter",
"wasmtime",
"wasmtime-cli-flags",
@@ -4903,18 +4934,18 @@ version = "50.0.0-dev"
dependencies = [
"anyhow",
"component-macro-test-helpers",
- "prettyplease",
+ "prettyplease 0.3.0",
"proc-macro2",
"quote",
"serde",
"serde_json",
"similar",
- "syn",
+ "syn 3.0.5",
"tracing",
"wasmtime",
"wasmtime-internal-component-util",
"wasmtime-internal-wit-bindgen",
- "wit-parser 0.258.0",
+ "wit-parser 0.259.0",
]
[[package]]
@@ -4948,7 +4979,7 @@ dependencies = [
"smallvec 1.15.1",
"target-lexicon 0.13.5",
"thiserror 2.0.17",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime-environ",
"wasmtime-internal-core",
"wasmtime-internal-unwinder",
@@ -5007,7 +5038,7 @@ dependencies = [
"gdbstub_arch",
"log",
"wasip2",
- "wit-bindgen 0.61.1",
+ "wit-bindgen 0.62.0",
"wstd",
]
@@ -5050,7 +5081,7 @@ version = "50.0.0-dev"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
]
[[package]]
@@ -5062,7 +5093,7 @@ dependencies = [
"log",
"object 0.40.0",
"target-lexicon 0.13.5",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime-environ",
"wasmtime-internal-cranelift",
"winch-codegen",
@@ -5076,8 +5107,8 @@ dependencies = [
"bitflags 2.11.1",
"heck",
"indexmap 2.14.0",
- "wit-component 0.258.0",
- "wit-parser 0.258.0",
+ "wit-component 0.259.0",
+ "wit-parser 0.259.0",
]
[[package]]
@@ -5102,7 +5133,7 @@ dependencies = [
"anyhow",
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
"wasmtime-test-util",
]
@@ -5121,7 +5152,7 @@ dependencies = [
"serde_derive",
"target-lexicon 0.13.5",
"toml",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmprinter",
"wasmtime",
"wasmtime-environ",
@@ -5270,9 +5301,9 @@ dependencies = [
"object 0.40.0",
"serde_json",
"tokio",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime",
- "wast 258.0.0",
+ "wast 259.0.0",
]
[[package]]
@@ -5286,8 +5317,8 @@ dependencies = [
"rayon",
"test-programs-artifacts",
"tokio",
- "wasm-encoder 0.258.0",
- "wasmparser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasmparser 0.259.0",
"wasmprinter",
"wasmtime",
"wasmtime-wasi",
@@ -5305,25 +5336,25 @@ dependencies = [
[[package]]
name = "wast"
-version = "258.0.0"
+version = "259.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97f7defc7ecca8b19ac7f824598eadd0c53985ee00c74060d65051e9da5b58a1"
+checksum = "c69beba8d9da07af9a0971b559149a2ac4729895b55144de4fddbf5a02660648"
dependencies = [
"bumpalo",
- "gimli 0.32.3",
+ "gimli 0.34.0",
"leb128fmt",
"memchr",
"unicode-width 0.2.0",
- "wasm-encoder 0.258.0",
+ "wasm-encoder 0.259.0",
]
[[package]]
name = "wat"
-version = "1.258.0"
+version = "1.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7555c008cca87f2ac58d9f83ccda7e7b44611093ce28eb28f052e7c78024b9bf"
+checksum = "c6eec44b0c80391b20fb7ad9ea440c72c5d382385bdf74444bb18321c425017e"
dependencies = [
- "wast 258.0.0",
+ "wast 259.0.0",
]
[[package]]
@@ -5379,7 +5410,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
"wasmtime-environ",
"witx",
]
@@ -5390,7 +5421,7 @@ version = "50.0.0-dev"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 3.0.5",
"wiggle",
"wiggle-generate",
]
@@ -5450,7 +5481,7 @@ dependencies = [
"smallvec 1.15.1",
"target-lexicon 0.13.5",
"thiserror 2.0.17",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
"wasmtime-environ",
"wasmtime-internal-core",
"wasmtime-internal-cranelift",
@@ -5485,7 +5516,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -5496,7 +5527,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -5632,13 +5663,13 @@ dependencies = [
[[package]]
name = "wit-bindgen"
-version = "0.61.1"
+version = "0.62.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e473fd0095479f9689ac7d2a52c427cc96bb2b973ace50238dfcc1ab1cd52d93"
+checksum = "53cb4b5556c3a791e86838ea287782bdafa704d55b0e68b5b81a3a16b9ea5f4b"
dependencies = [
"bitflags 2.11.1",
"futures",
- "wit-bindgen-rust-macro 0.61.1",
+ "wit-bindgen-rust-macro 0.62.0",
]
[[package]]
@@ -5654,13 +5685,13 @@ dependencies = [
[[package]]
name = "wit-bindgen-core"
-version = "0.61.1"
+version = "0.62.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87445680dfe6d6b5369e884bd63c03a3335268e855365b2fc3f7bcdce96a630e"
+checksum = "72ad22a37ecbc0e1fdca34d2b670ba41368cb0920735643e00fdf39a16ee5431"
dependencies = [
"anyhow",
"heck",
- "wit-parser 0.258.0",
+ "wit-parser 0.259.0",
]
[[package]]
@@ -5681,8 +5712,8 @@ dependencies = [
"anyhow",
"heck",
"indexmap 2.14.0",
- "prettyplease",
- "syn",
+ "prettyplease 0.2.31",
+ "syn 2.0.106",
"wasm-metadata 0.244.0",
"wit-bindgen-core 0.51.0",
"wit-component 0.244.0",
@@ -5690,18 +5721,18 @@ dependencies = [
[[package]]
name = "wit-bindgen-rust"
-version = "0.61.1"
+version = "0.62.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f2fe494de0d898216caf0fd0ae76af75753fcb3ff4f465b46131537cf24cf8"
+checksum = "84ba5213d4332c260a0d4e69e34b0f7e4b85ddae10b6ebfbac00d9c185ba628a"
dependencies = [
"anyhow",
"heck",
"indexmap 2.14.0",
- "prettyplease",
- "syn",
- "wasm-metadata 0.258.0",
- "wit-bindgen-core 0.61.1",
- "wit-component 0.258.0",
+ "prettyplease 0.3.0",
+ "syn 3.0.5",
+ "wasm-metadata 0.259.0",
+ "wit-bindgen-core 0.62.0",
+ "wit-component 0.259.0",
]
[[package]]
@@ -5711,28 +5742,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
dependencies = [
"anyhow",
- "prettyplease",
+ "prettyplease 0.2.31",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
"wit-bindgen-core 0.51.0",
"wit-bindgen-rust 0.51.0",
]
[[package]]
name = "wit-bindgen-rust-macro"
-version = "0.61.1"
+version = "0.62.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59283a01aec94f60f92ada22ffe182a5cea8acfce43be3be688de8d52df55312"
+checksum = "8f19d63da8e478a370ef8192d90ccb517965b7747d6b46cd2d831dd0ef4d2541"
dependencies = [
"anyhow",
"macro-string",
- "prettyplease",
+ "prettyplease 0.3.0",
"proc-macro2",
"quote",
- "syn",
- "wit-bindgen-core 0.61.1",
- "wit-bindgen-rust 0.61.1",
+ "syn 3.0.5",
+ "wit-bindgen-core 0.62.0",
+ "wit-bindgen-rust 0.62.0",
]
[[package]]
@@ -5756,9 +5787,9 @@ dependencies = [
[[package]]
name = "wit-component"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "481b5c47b2ecce0389b5e08a05557d6a190c9cd761773b8880a8017ee04dc7ef"
+checksum = "092f783dee3253265fcde131475055f8c275ac0176a9c0396db1dc7b5544bfb4"
dependencies = [
"anyhow",
"bitflags 2.11.1",
@@ -5767,10 +5798,10 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
- "wasm-encoder 0.258.0",
- "wasm-metadata 0.258.0",
- "wasmparser 0.258.0",
- "wit-parser 0.258.0",
+ "wasm-encoder 0.259.0",
+ "wasm-metadata 0.259.0",
+ "wasmparser 0.259.0",
+ "wit-parser 0.259.0",
]
[[package]]
@@ -5793,9 +5824,9 @@ dependencies = [
[[package]]
name = "wit-parser"
-version = "0.258.0"
+version = "0.259.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4daaa3cd97ae49ecd0a99dc009d453f93e0f083dd3be38c0f24a83a93e37ac"
+checksum = "6390f4f02493ce678d509c859cf1698e38929fb75c8012a6ee2f7d6b6cb66cd7"
dependencies = [
"anyhow",
"hashbrown 0.17.0",
@@ -5807,7 +5838,7 @@ dependencies = [
"serde_derive",
"serde_json",
"unicode-ident",
- "wasmparser 0.258.0",
+ "wasmparser 0.259.0",
]
[[package]]
@@ -5876,7 +5907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6a9df01a7fb39fbe7e9b5ef76f586f06425dd6f2be350de4781936f72f9899d"
dependencies = [
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
@@ -5919,7 +5950,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
"synstructure",
]
@@ -5940,7 +5971,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
"synstructure",
]
@@ -5969,7 +6000,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.106",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 788946ab61..3ba5a4e286 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -364,22 +364,22 @@ wasip1 = { version = "1.0.0", default-features = false }
target-lexicon = "0.13.5"
rustix = "1.1.4"
# wit-bindgen:
-wit-bindgen = { version = "0.61.1", default-features = false }
-wit-bindgen-rust-macro = { version = "0.61.1", default-features = false }
+wit-bindgen = { version = "0.62.0", default-features = false }
+wit-bindgen-rust-macro = { version = "0.62.0", default-features = false }
# wasm-tools family:
-wasmparser = { version = "0.258.0", default-features = false, features = ['simd'] }
-wat = "1.258.0"
-wast = "258.0.0"
-wasmprinter = "0.258.0"
-wasm-encoder = "0.258.0"
-wasm-smith = "0.258.0"
-wasm-mutate = "0.258.0"
-wit-parser = "0.258.0"
-wit-component = "0.258.0"
-wasm-wave = "0.258.0"
-wasm-compose = { version = "0.258.0", default-features = false }
-json-from-wast = "0.258.0"
+wasmparser = { version = "0.259.0", default-features = false, features = ['simd'] }
+wat = "1.259.0"
+wast = "259.0.0"
+wasmprinter = "0.259.0"
+wasm-encoder = "0.259.0"
+wasm-smith = "0.259.0"
+wasm-mutate = "0.259.0"
+wit-parser = "0.259.0"
+wit-component = "0.259.0"
+wasm-wave = "0.259.0"
+wasm-compose = { version = "0.259.0", default-features = false }
+json-from-wast = "0.259.0"
wstd = "0.6.5"
wasip2 = "1.0"
@@ -434,7 +434,7 @@ http-body-util = "0.1.3"
bytes = { version = "1.11.1", default-features = false }
futures = { version = "0.3.31", default-features = false }
indexmap = { version = "2.14.0", default-features = false }
-syn = "2.0.106"
+syn = "3.0.5"
quote = "1.0.41"
proc-macro2 = "1.0.101"
test-log = { version = "0.2.18", default-features = false, features = ["trace"] }
diff --git a/crates/component-macro/Cargo.toml b/crates/component-macro/Cargo.toml
index 5ac980d08a..dbeefed91d 100644
--- a/crates/component-macro/Cargo.toml
+++ b/crates/component-macro/Cargo.toml
@@ -36,7 +36,7 @@ tracing = { workspace = true }
# For use with the custom attributes test
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
-prettyplease = "0.2.31"
+prettyplease = "0.3.0"
similar = { workspace = true }
wit-parser = { workspace = true, features = ["decoding"] }
diff --git a/crates/component-macro/src/component.rs b/crates/component-macro/src/component.rs
index a9f693bd54..af4b340c6f 100644
--- a/crates/component-macro/src/component.rs
+++ b/crates/component-macro/src/component.rs
@@ -1347,7 +1347,8 @@ pub fn expand_flags(flags: &Flags) -> Result<TokenStream> {
ident: Some(format_ident!("__inner{}", index)),
colon_token: None,
ty: ty.clone(),
- mutability: syn::FieldMutability::None,
+ modifiers: syn::FieldModifiers::default(),
+ default: None,
})
.collect::<Vec<_>>()
};
diff --git a/crates/cranelift/src/compiler/component.rs b/crates/cranelift/src/compiler/component.rs
index c580f197bd..815ca0ef6d 100644
--- a/crates/cranelift/src/compiler/component.rs
+++ b/crates/cranelift/src/compiler/component.rs
@@ -742,111 +742,63 @@ impl<'a> TrampolineCompiler<'a> {
},
);
}
- Trampoline::ThreadSuspend {
- instance,
- cancellable,
- } => {
+ Trampoline::ThreadSuspend { instance } => {
self.translate_libcall(
host::thread_suspend,
TrapSentinel::NegativeOne,
WasmArgs::InRegisters,
|me, params| {
params.push(me.index_value(*instance));
- params.push(
- me.builder
- .ins()
- .iconst(ir::types::I8, i64::from(*cancellable)),
- );
},
);
}
- Trampoline::ThreadYield {
- instance,
- cancellable,
- } => {
+ Trampoline::ThreadYield { instance } => {
self.translate_libcall(
host::thread_yield,
TrapSentinel::NegativeOne,
WasmArgs::InRegisters,
|me, params| {
params.push(me.index_value(*instance));
- params.push(
- me.builder
- .ins()
- .iconst(ir::types::I8, i64::from(*cancellable)),
- );
},
);
}
- Trampoline::ThreadSuspendThenResume {
- instance,
- cancellable,
- } => {
+ Trampoline::ThreadSuspendThenResume { instance } => {
self.translate_libcall(
host::thread_suspend_then_resume,
TrapSentinel::NegativeOne,
WasmArgs::InRegisters,
|me, params| {
params.push(me.index_value(*instance));
- params.push(
- me.builder
- .ins()
- .iconst(ir::types::I8, i64::from(*cancellable)),
- );
},
);
}
- Trampoline::ThreadYieldThenResume {
- instance,
- cancellable,
- } => {
+ Trampoline::ThreadYieldThenResume { instance } => {
self.translate_libcall(
host::thread_yield_then_resume,
TrapSentinel::NegativeOne,
WasmArgs::InRegisters,
|me, params| {
params.push(me.index_value(*instance));
- params.push(
- me.builder
- .ins()
- .iconst(ir::types::I8, i64::from(*cancellable)),
- );
},
);
}
- Trampoline::ThreadSuspendThenPromote {
- instance,
- cancellable,
- } => {
+ Trampoline::ThreadSuspendThenPromote { instance } => {
self.translate_libcall(
host::thread_suspend_then_promote,
TrapSentinel::NegativeOne,
WasmArgs::InRegisters,
|me, params| {
params.push(me.index_value(*instance));
- params.push(
- me.builder
- .ins()
- .iconst(ir::types::I8, i64::from(*cancellable)),
- );
},
);
}
- Trampoline::ThreadYieldThenPromote {
- instance,
- cancellable,
- } => {
+ Trampoline::ThreadYieldThenPromote { instance } => {
self.translate_libcall(
host::thread_yield_then_promote,
TrapSentinel::NegativeOne,
WasmArgs::InRegisters,
|me, params| {
params.push(me.index_value(*instance));
- params.push(
- me.builder
- .ins()
- .iconst(ir::types::I8, i64::from(*cancellable)),
- );
},
);
}
diff --git a/crates/environ/src/component.rs b/crates/environ/src/component.rs
index 9329cb5440..df5f96df67 100644
--- a/crates/environ/src/component.rs
+++ b/crates/environ/src/component.rs
@@ -194,17 +194,17 @@ macro_rules! foreach_builtin_component_function {
#[cfg(feature = "component-model-async")]
thread_resume_later(vmctx: vmctx, caller_instance: u32, thread_idx: u32) -> bool;
#[cfg(feature = "component-model-async")]
- thread_suspend(vmctx: vmctx, caller_instance: u32, cancellable: u8) -> u32;
+ thread_suspend(vmctx: vmctx, caller_instance: u32) -> u32;
#[cfg(feature = "component-model-async")]
- thread_yield(vmctx: vmctx, caller_instance: u32, cancellable: u8) -> u32;
+ thread_yield(vmctx: vmctx, caller_instance: u32) -> u32;
#[cfg(feature = "component-model-async")]
- thread_suspend_then_resume(vmctx: vmctx, caller_instance: u32, cancellable: u8, thread_idx: u32) -> u32;
+ thread_suspend_then_resume(vmctx: vmctx, caller_instance: u32, thread_idx: u32) -> u32;
#[cfg(feature = "component-model-async")]
- thread_yield_then_resume(vmctx: vmctx, caller_instance: u32, cancellable: u8, thread_idx: u32) -> u32;
+ thread_yield_then_resume(vmctx: vmctx, caller_instance: u32, thread_idx: u32) -> u32;
#[cfg(feature = "component-model-async")]
- thread_suspend_then_promote(vmctx: vmctx, caller_instance: u32, cancellable: u8, thread_idx: u32) -> u32;
+ thread_suspend_then_promote(vmctx: vmctx, caller_instance: u32, thread_idx: u32) -> u32;
#[cfg(feature = "component-model-async")]
- thread_yield_then_promote(vmctx: vmctx, caller_instance: u32, cancellable: u8, thread_idx: u32) -> u32;
+ thread_yield_then_promote(vmctx: vmctx, caller_instance: u32, thread_idx: u32) -> u32;
utf8_to_utf8(vmctx: vmctx, src: ptr_u8, len: size, dst: ptr_u8) -> bool;
utf16_to_utf16(vmctx: vmctx, src: ptr_u16, len: size, dst: ptr_u16) -> bool;
diff --git a/crates/environ/src/component/dfg.rs b/crates/environ/src/component/dfg.rs
index a67bf17d35..3b2aa8a17d 100644
--- a/crates/environ/src/component/dfg.rs
+++ b/crates/environ/src/component/dfg.rs
@@ -489,27 +489,21 @@ pub enum Trampoline {
},
ThreadSuspend {
instance: RuntimeComponentInstanceIndex,
- cancellable: bool,
},
ThreadYield {
instance: RuntimeComponentInstanceIndex,
- cancellable: bool,
},
ThreadSuspendThenResume {
instance: RuntimeComponentInstanceIndex,
- cancellable: bool,
},
ThreadYieldThenResume {
instance: RuntimeComponentInstanceIndex,
- cancellable: bool,
},
ThreadSuspendThenPromote {
instance: RuntimeComponentInstanceIndex,
- cancellable: bool,
},
ThreadYieldThenPromote {
instance: RuntimeComponentInstanceIndex,
- cancellable: bool,
},
}
@@ -547,7 +541,6 @@ pub struct CanonicalOptions {
pub callback: Option<CallbackId>,
pub post_return: Option<PostReturnId>,
pub async_: bool,
- pub cancellable: bool,
pub core_type: ModuleInternedTypeIndex,
pub data_model: CanonicalOptionsDataModel,
}
@@ -852,7 +845,6 @@ impl LinearizeDfg<'_> {
callback,
post_return,
async_: options.async_,
- cancellable: options.cancellable,
core_type: options.core_type,
data_model,
};
@@ -1176,48 +1168,32 @@ impl LinearizeDfg<'_> {
Trampoline::ThreadResumeLater { instance } => info::Trampoline::ThreadResumeLater {
instance: *instance,
},
- Trampoline::ThreadSuspend {
- instance,
- cancellable,
- } => info::Trampoline::ThreadSuspend {
- instance: *instance,
- cancellable: *cancellable,
- },
- Trampoline::ThreadYield {
- instance,
- cancellable,
- } => info::Trampoline::ThreadYield {
- instance: *instance,
- cancellable: *cancellable,
- },
- Trampoline::ThreadSuspendThenResume {
- instance,
- cancellable,
- } => info::Trampoline::ThreadSuspendThenResume {
- instance: *instance,
- cancellable: *cancellable,
- },
- Trampoline::ThreadYieldThenResume {
- instance,
- cancellable,
- } => info::Trampoline::ThreadYieldThenResume {
- instance: *instance,
- cancellable: *cancellable,
- },
- Trampoline::ThreadSuspendThenPromote {
- instance,
- cancellable,
- } => info::Trampoline::ThreadSuspendThenPromote {
+ Trampoline::ThreadSuspend { instance } => info::Trampoline::ThreadSuspend {
instance: *instance,
- cancellable: *cancellable,
},
- Trampoline::ThreadYieldThenPromote {
- instance,
- cancellable,
- } => info::Trampoline::ThreadYieldThenPromote {
+ Trampoline::ThreadYield { instance } => info::Trampoline::ThreadYield {
instance: *instance,
- cancellable: *cancellable,
},
+ Trampoline::ThreadSuspendThenResume { instance } => {
+ info::Trampoline::ThreadSuspendThenResume {
+ instance: *instance,
+ }
+ }
+ Trampoline::ThreadYieldThenResume { instance } => {
+ info::Trampoline::ThreadYieldThenResume {
+ instance: *instance,
+ }
+ }
+ Trampoline::ThreadSuspendThenPromote { instance } => {
+ info::Trampoline::ThreadSuspendThenPromote {
+ instance: *instance,
+ }
+ }
+ Trampoline::ThreadYieldThenPromote { instance } => {
+ info::Trampoline::ThreadYieldThenPromote {
+ instance: *instance,
+ }
+ }
};
let i1 = self.trampolines.push(*signature);
let i2 = self.trampoline_defs.push(trampoline);
diff --git a/crates/environ/src/component/info.rs b/crates/environ/src/component/info.rs
index 0e96aa0470..6df332bf41 100644
--- a/crates/environ/src/component/info.rs
+++ b/crates/environ/src/component/info.rs
@@ -531,10 +531,6 @@ pub struct CanonicalOptions {
/// Whether to use the async ABI for lifting or lowering.
pub async_: bool,
- /// Whether or not this function can consume a task cancellation
- /// notification.
- pub cancellable: bool,
-
/// The core function type that is being lifted from / lowered to.
pub core_type: ModuleInternedTypeIndex,
@@ -1131,9 +1127,6 @@ pub enum Trampoline {
ThreadSuspend {
/// The specific component instance which is calling the intrinsic.
instance: RuntimeComponentInstanceIndex,
- /// If `true`, indicates the caller instance may receive notification
- /// of task cancellation.
- cancellable: bool,
},
/// A `thread.yield` intrinsic, which yields control to the host so that other
@@ -1141,9 +1134,6 @@ pub enum Trampoline {
ThreadYield {
/// The specific component instance which is calling the intrinsic.
instance: RuntimeComponentInstanceIndex,
- /// If `true`, indicates the caller instance may receive notification
- /// of task cancellation.
- cancellable: bool,
},
/// Intrinsic used to implement the `thread.suspend-then-resume` component
@@ -1151,9 +1141,6 @@ pub enum Trampoline {
ThreadSuspendThenResume {
/// The specific component instance which is calling the intrinsic.
instance: RuntimeComponentInstanceIndex,
- /// If `true`, indicates the caller instance may receive notification
- /// of task cancellation.
- cancellable: bool,
},
/// Intrinsic used to implement the `thread.yield-then-resume` component
@@ -1161,9 +1148,6 @@ pub enum Trampoline {
ThreadYieldThenResume {
/// The specific component instance which is calling the intrinsic.
instance: RuntimeComponentInstanceIndex,
- /// If `true`, indicates the caller instance may receive notification
- /// of task cancellation.
- cancellable: bool,
},
/// Intrinsic used to implement the `thread.suspend-then-promote` component
@@ -1171,9 +1155,6 @@ pub enum Trampoline {
ThreadSuspendThenPromote {
/// The specific component instance which is calling the intrinsic.
instance: RuntimeComponentInstanceIndex,
- /// If `true`, indicates the caller instance may receive notification
- /// of task cancellation.
- cancellable: bool,
},
/// Intrinsic used to implement the `thread.yield-then-promote` component
@@ -1181,9 +1162,6 @@ pub enum Trampoline {
ThreadYieldThenPromote {
/// The specific component instance which is calling the intrinsic.
instance: RuntimeComponentInstanceIndex,
- /// If `true`, indicates the caller instance may receive notification
- /// of task cancellation.
- cancellable: bool,
},
}
diff --git a/crates/environ/src/component/translate.rs b/crates/environ/src/component/translate.rs
index 280c97574c..00e9ec7f17 100644
--- a/crates/environ/src/component/translate.rs
+++ b/crates/environ/src/component/translate.rs
@@ -320,27 +320,21 @@ enum LocalInitializer<'data> {
},
ThreadSuspend {
func: ModuleInternedTypeIndex,
- cancellable: bool,
},
ThreadYield {
func: ModuleInternedTypeIndex,
- cancellable: bool,
},
ThreadSuspendThenResume {
func: ModuleInternedTypeIndex,
- cancellable: bool,
},
ThreadYieldThenResume {
func: ModuleInternedTypeIndex,
- cancellable: bool,
},
ThreadSuspendThenPromote {
func: ModuleInternedTypeIndex,
- cancellable: bool,
},
ThreadYieldThenPromote {
func: ModuleInternedTypeIndex,
- cancellable: bool,
},
// core wasm modules
@@ -428,7 +422,6 @@ struct LocalCanonicalOptions {
string_encoding: StringEncoding,
post_return: Option<FuncIndex>,
async_: bool,
- cancellable: bool,
callback: Option<FuncIndex>,
/// The type index of the core GC types signature.
core_type: ModuleInternedTypeIndex,
@@ -1055,16 +1048,12 @@ impl<'a, 'data> Translator<'a, 'data> {
core_func_index += 1;
LocalInitializer::WaitableSetNew { func }
}
- wasmparser::CanonicalFunction::WaitableSetWait {
- cancellable,
- memory,
- } => {
+ wasmparser::CanonicalFunction::WaitableSetWait { memory } => {
let core_type = self.core_func_signature(core_func_index)?;
core_func_index += 1;
LocalInitializer::WaitableSetWait {
options: LocalCanonicalOptions {
core_type,
- cancellable,
async_: false,
data_model: LocalDataModel::LinearMemory {
memory: Some(MemoryIndex::from_u32(memory)),
@@ -1076,17 +1065,13 @@ impl<'a, 'data> Translator<'a, 'data> {
},
}
}
- wasmparser::CanonicalFunction::WaitableSetPoll {
- cancellable,
- memory,
- } => {
+ wasmparser::CanonicalFunction::WaitableSetPoll { memory } => {
let core_type = self.core_func_signature(core_func_index)?;
core_func_index += 1;
LocalInitializer::WaitableSetPoll {
options: LocalCanonicalOptions {
core_type,
async_: false,
- cancellable,
data_model: LocalDataModel::LinearMemory {
memory: Some(MemoryIndex::from_u32(memory)),
realloc: None,
@@ -1310,35 +1295,35 @@ impl<'a, 'data> Translator<'a, 'data> {
core_func_index += 1;
LocalInitializer::ThreadResumeLater { func }
}
- wasmparser::CanonicalFunction::ThreadSuspend { cancellable } => {
+ wasmparser::CanonicalFunction::ThreadSuspend => {
let func = self.core_func_signature(core_func_index)?;
core_func_index += 1;
- LocalInitializer::ThreadSuspend { func, cancellable }
+ LocalInitializer::ThreadSuspend { func }
}
- wasmparser::CanonicalFunction::ThreadYield { cancellable } => {
+ wasmparser::CanonicalFunction::ThreadYield => {
let func = self.core_func_signature(core_func_index)?;
core_func_index += 1;
- LocalInitializer::ThreadYield { func, cancellable }
+ LocalInitializer::ThreadYield { func }
}
- wasmparser::CanonicalFunction::ThreadSuspendThenResume { cancellable } => {
+ wasmparser::CanonicalFunction::ThreadSuspendThenResume => {
let func = self.core_func_signature(core_func_index)?;
core_func_index += 1;
- LocalInitializer::ThreadSuspendThenResume { func, cancellable }
+ LocalInitializer::ThreadSuspendThenResume { func }
}
- wasmparser::CanonicalFunction::ThreadYieldThenResume { cancellable } => {
+ wasmparser::CanonicalFunction::ThreadYieldThenResume => {
let func = self.core_func_signature(core_func_index)?;
core_func_index += 1;
- LocalInitializer::ThreadYieldThenResume { func, cancellable }
+ LocalInitializer::ThreadYieldThenResume { func }
}
- wasmparser::CanonicalFunction::ThreadSuspendThenPromote { cancellable } => {
+ wasmparser::CanonicalFunction::ThreadSuspendThenPromote => {
let func = self.core_func_signature(core_func_index)?;
core_func_index += 1;
- LocalInitializer::ThreadSuspendThenPromote { func, cancellable }
+ LocalInitializer::ThreadSuspendThenPromote { func }
}
- wasmparser::CanonicalFunction::ThreadYieldThenPromote { cancellable } => {
+ wasmparser::CanonicalFunction::ThreadYieldThenPromote => {
let func = self.core_func_signature(core_func_index)?;
core_func_index += 1;
- LocalInitializer::ThreadYieldThenPromote { func, cancellable }
+ LocalInitializer::ThreadYieldThenPromote { func }
}
};
self.result.initializers.push(init);
@@ -1778,7 +1763,6 @@ impl<'a, 'data> Translator<'a, 'data> {
Ok(LocalCanonicalOptions {
string_encoding,
post_return,
- cancellable: false,
async_,
callback,
core_type,
diff --git a/crates/environ/src/component/translate/adapt.rs b/crates/environ/src/component/translate/adapt.rs
index d68bd0c41a..a22da96c31 100644
--- a/crates/environ/src/component/translate/adapt.rs
+++ b/crates/environ/src/component/translate/adapt.rs
@@ -172,9 +172,6 @@ pub struct AdapterOptions {
pub post_return: Option<dfg::CoreDef>,
/// Whether to use the async ABI for lifting or lowering.
pub async_: bool,
- /// Whether or not this intrinsic can consume a task cancellation
- /// notification.
- pub cancellable: bool,
/// The core function type that is being lifted from / lowered to.
pub core_type: ModuleInternedTypeIndex,
/// The data model used by this adapter: linear memory or GC objects.
diff --git a/crates/environ/src/component/translate/inline.rs b/crates/environ/src/component/translate/inline.rs
index 4fd2f4a55e..4f3d7d2566 100644
--- a/crates/environ/src/component/translate/inline.rs
+++ b/crates/environ/src/component/translate/inline.rs
@@ -1132,62 +1132,56 @@ impl<'a> Inliner<'a> {
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
}
- ThreadSuspend { func, cancellable } => {
+ ThreadSuspend { func } => {
let index = self.result.trampolines.push((
*func,
dfg::Trampoline::ThreadSuspend {
instance: frame.instance,
- cancellable: *cancellable,
},
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
}
- ThreadYield { func, cancellable } => {
+ ThreadYield { func } => {
let index = self.result.trampolines.push((
*func,
dfg::Trampoline::ThreadYield {
instance: frame.instance,
- cancellable: *cancellable,
},
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
}
- ThreadSuspendThenResume { func, cancellable } => {
+ ThreadSuspendThenResume { func } => {
let index = self.result.trampolines.push((
*func,
dfg::Trampoline::ThreadSuspendThenResume {
instance: frame.instance,
- cancellable: *cancellable,
},
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
}
- ThreadYieldThenResume { func, cancellable } => {
+ ThreadYieldThenResume { func } => {
let index = self.result.trampolines.push((
*func,
dfg::Trampoline::ThreadYieldThenResume {
instance: frame.instance,
- cancellable: *cancellable,
},
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
}
- ThreadSuspendThenPromote { func, cancellable } => {
+ ThreadSuspendThenPromote { func } => {
let index = self.result.trampolines.push((
*func,
dfg::Trampoline::ThreadSuspendThenPromote {
instance: frame.instance,
- cancellable: *cancellable,
},
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
}
- ThreadYieldThenPromote { func, cancellable } => {
+ ThreadYieldThenPromote { func } => {
let index = self.result.trampolines.push((
*func,
dfg::Trampoline::ThreadYieldThenPromote {
instance: frame.instance,
- cancellable: *cancellable,
},
));
frame.funcs.push((*func, dfg::CoreDef::Trampoline(index)));
@@ -1587,7 +1581,6 @@ impl<'a> Inliner<'a> {
callback,
post_return,
async_: options.async_,
- cancellable: options.cancellable,
core_type: options.core_type,
data_model,
}
@@ -1617,7 +1610,6 @@ impl<'a> Inliner<'a> {
callback,
post_return,
async_: options.async_,
- cancellable: options.cancellable,
core_type: options.core_type,
data_model,
})
diff --git a/crates/environ/src/fact.rs b/crates/environ/src/fact.rs
index 54f50880c6..d4645b8cc3 100644
--- a/crates/environ/src/fact.rs
+++ b/crates/environ/src/fact.rs
@@ -363,9 +363,7 @@ impl<'a> Module<'a> {
async_,
core_type,
data_model,
- cancellable,
} = options;
- assert!(!cancellable);
let flags = self.import_global(
"flags",
diff --git a/crates/fuzzing/src/generators/module.rs b/crates/fuzzing/src/generators/module.rs
index e9d602f36e..3cfcca2264 100644
--- a/crates/fuzzing/src/generators/module.rs
+++ b/crates/fuzzing/src/generators/module.rs
@@ -77,6 +77,9 @@ impl<'a> Arbitrary<'a> for ModuleConfig {
// do that most of the time.
config.disallow_traps = u.ratio(9, 10)?;
+ // not supported in wasmtime yet
+ config.compact_imports_enabled = false;
+
Ok(ModuleConfig {
component_model_async: false,
component_model_more_async_builtins: false,
diff --git a/crates/misc/component-async-tests/tests/scenario/yield_.rs b/crates/misc/component-async-tests/tests/scenario/yield_.rs
index 70de715ea3..2c05894d08 100644
--- a/crates/misc/component-async-tests/tests/scenario/yield_.rs
+++ b/crates/misc/component-async-tests/tests/scenario/yield_.rs
@@ -18,15 +18,6 @@ pub fn async_yield_caller() {}
)]
pub fn async_yield_caller_cancel() {}
-#[tokio::test]
-pub async fn async_yield_callee_synchronous() -> Result<()> {
- test_run(&[
- test_programs_artifacts::ASYNC_YIELD_CALLER_COMPONENT,
- test_programs_artifacts::ASYNC_YIELD_CALLEE_SYNCHRONOUS_COMPONENT,
- ])
- .await
-}
-
#[tokio::test]
pub async fn async_yield_callee_stackless() -> Result<()> {
test_run(&[
@@ -36,15 +27,6 @@ pub async fn async_yield_callee_stackless() -> Result<()> {
.await
}
-#[tokio::test]
-pub async fn async_yield_callee_cancel_synchronous() -> Result<()> {
- test_run(&[
- test_programs_artifacts::ASYNC_YIELD_CALLER_CANCEL_COMPONENT,
- test_programs_artifacts::ASYNC_YIELD_CALLEE_SYNCHRONOUS_COMPONENT,
- ])
- .await
-}
-
#[tokio::test]
pub async fn async_yield_callee_cancel_stackless() -> Result<()> {
test_run(&[
diff --git a/crates/misc/component-async-tests/tests/test_all.rs b/crates/misc/component-async-tests/tests/test_all.rs
index 92ccf5ae77..7d030a88a5 100644
--- a/crates/misc/component-async-tests/tests/test_all.rs
+++ b/crates/misc/component-async-tests/tests/test_all.rs
@@ -40,6 +40,5 @@ use scenario::transmit::{
};
use scenario::unit_stream::{async_unit_stream_callee, async_unit_stream_caller};
use scenario::yield_::{
- async_yield_callee_stackless, async_yield_callee_synchronous, async_yield_caller,
- async_yield_caller_cancel,
+ async_yield_callee_stackless, async_yield_caller, async_yield_caller_cancel,
};
diff --git a/crates/test-programs/src/bin/async_yield_callee_synchronous.rs b/crates/test-programs/src/bin/async_yield_callee_synchronous.rs
deleted file mode 100644
index 5a13243e8c..0000000000
--- a/crates/test-programs/src/bin/async_yield_callee_synchronous.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-mod bindings {
- wit_bindgen::generate!({
- path: "../misc/component-async-tests/wit",
- world: "yield-callee",
- async: ["-local:local/run#run"],
- });
-
- use super::Component;
- export!(Component);
-}
-
-use bindings::{exports::local::local::run::Guest, local::local::continue_};
-
-#[cfg(not(target_arch = "wasm32"))]
-unsafe fn yield_cancellable() -> bool {
- unreachable!();
-}
-
-#[cfg(target_arch = "wasm32")]
-#[link(wasm_import_module = "$root")]
-unsafe extern "C" {
- #[link_name = "[cancellable][thread-yield]"]
- fn yield_cancellable() -> bool;
-}
-
-struct Component;
-
-impl Guest for Component {
- fn run() {
- while continue_::get_continue() && unsafe { !yield_cancellable() } {}
- }
-}
-
-// Unused function; required since this file is built as a `bin`:
-fn main() {}
diff --git a/crates/test-util/src/wast.rs b/crates/test-util/src/wast.rs
index dd8b301b2d..ba2e18a6f9 100644
--- a/crates/test-util/src/wast.rs
+++ b/crates/test-util/src/wast.rs
@@ -525,6 +525,13 @@ impl WastTest {
return true;
}
+ // Waiting for WebAssembly/component-model#716 to land
+ if self.path.ends_with("async/cancellable.wast")
+ || self.path.ends_with("binary/binary.wast")
+ {
+ return true;
+ }
+
// Some tests are known to fail with the pooling allocator
if config.pooling {
// allocates too much memory for the pooling configuration here
@@ -692,19 +699,6 @@ impl WastTest {
return true;
}
- // These will require a wasm-tools update:
- let need_wasm_tools_updates = [
- "component-model/test/validation/max-value-size.wast",
- "component-model/test/validation/kebab.wast",
- ];
-
- if need_wasm_tools_updates
- .iter()
- .any(|part| self.path.ends_with(part))
- {
- return true;
- }
-
false
}
}
diff --git a/crates/wasmtime/src/runtime/component/concurrent.rs b/crates/wasmtime/src/runtime/component/concurrent.rs
index d5ae0f5cb2..954a81f925 100644
--- a/crates/wasmtime/src/runtime/component/concurrent.rs
+++ b/crates/wasmtime/src/runtime/component/concurrent.rs
@@ -685,10 +685,7 @@ enum SuspendReason {
NeedWork,
/// The fiber is yielding and should be resumed once other tasks have had a
/// chance to run.
- Yielding {
- thread: QualifiedThreadId,
- cancellable: bool,
- },
+ Yielding { thread: QualifiedThreadId },
/// The fiber was explicitly suspended with a call to `thread.suspend` or `thread.switch-to`.
ExplicitlySuspending { thread: QualifiedThreadId },
}
@@ -1810,18 +1807,6 @@ impl StoreOpaque {
}
}
- /// Returns whether there's a pending cancellation on the current guest thread,
- /// consuming the event if so.
- fn take_pending_cancellation(&mut self) -> Result<bool> {
- let thread = self.current_guest_thread()?;
- let task = self.concurrent_state_mut()?.get_mut(thread.task)?;
- if let Some(Event::Cancelled) = task.event {
- task.event.take();
- return Ok(true);
- }
- Ok(false)
- }
-
fn enter_sync_call(&mut self, callee: RuntimeInstance) -> Result<()> {
log::trace!("enter sync-typed call {callee:?}");
let state = self.instance_state(callee).concurrent_state();
@@ -2188,12 +2173,8 @@ impl StoreOpaque {
fiber.dispose(self);
}
}
- SuspendReason::Yielding {
- thread,
- cancellable,
- } => {
- state.get_mut(thread.thread)?.state =
- GuestThreadState::Ready { fiber, cancellable };
+ SuspendReason::Yielding { thread } => {
+ state.get_mut(thread.thread)?.state = GuestThreadState::Ready { fiber };
let instance = state.get_mut(thread.task)?.instance;
state.push_low_priority(WorkItem::ResumeThread { instance, thread });
}
@@ -3771,7 +3752,6 @@ impl Instance {
payload: u32,
) -> Result<u32> {
let &CanonicalOptions {
- cancellable,
instance: caller_instance,
..
} = &self.id().get(store).component().env_component().options[options];
@@ -3784,7 +3764,6 @@ impl Instance {
self.waitable_check(
store,
caller,
- cancellable,
WaitableCheck::Wait,
WaitableCheckParams {
set: TableId::new(rep),
@@ -3803,7 +3782,6 @@ impl Instance {
payload: u32,
) -> Result<u32> {
let &CanonicalOptions {
- cancellable,
instance: caller_instance,
..
} = &self.id().get(store).component().env_component().options[options];
@@ -3816,7 +3794,6 @@ impl Instance {
self.waitable_check(
store,
caller,
- cancellable,
WaitableCheck::Poll,
WaitableCheckParams {
set: TableId::new(rep),
@@ -3978,9 +3955,9 @@ impl Instance {
priority,
)?;
}
- GuestThreadState::Ready { fiber, cancellable } => {
+ GuestThreadState::Ready { fiber } => {
log::trace!("resuming thread {thread_id:?} that was ready");
- thread.state = GuestThreadState::Ready { fiber, cancellable };
+ thread.state = GuestThreadState::Ready { fiber };
store
.concurrent_state_mut()?
.promote_thread_work_item(guest_thread)?;
@@ -4018,15 +3995,9 @@ impl Instance {
self,
store: &mut StoreOpaque,
caller: RuntimeComponentInstanceIndex,
- cancellable: bool,
yielding: bool,
to_thread: SuspensionTarget,
) -> Result<WaitResult> {
- // There could be a pending cancellation from a previous uncancellable wait
- if cancellable && store.take_pending_cancellation()? {
- return Ok(WaitResult::Cancelled);
- }
-
let check_suspend = match to_thread {
SuspensionTarget::Promote(thread) => {
!self.resume_thread(store, caller, thread, ResumeThread::Promote)?
@@ -4056,7 +4027,6 @@ impl Instance {
let reason = if yielding {
SuspendReason::Yielding {
thread: guest_thread,
- cancellable,
}
} else {
SuspendReason::ExplicitlySuspending {
@@ -4066,11 +4036,7 @@ impl Instance {
store.suspend(reason)?;
- if cancellable && store.take_pending_cancellation()? {
- Ok(WaitResult::Cancelled)
- } else {
- Ok(WaitResult::Completed)
- }
+ Ok(WaitResult::Completed)
}
/// Helper function for the `waitable-set.wait` and `waitable-set.poll` intrinsics.
@@ -4078,7 +4044,6 @@ impl Instance {
self,
store: &mut StoreOpaque,
caller: RuntimeInstance,
- cancellable: bool,
check: WaitableCheck,
params: WaitableCheckParams,
) -> Result<u32> {
@@ -4095,23 +4060,11 @@ impl Instance {
WaitableCheck::Wait => {
let set = params.set;
- if (task.event.is_none()
- || (matches!(task.event, Some(Event::Cancelled)) && !cancellable))
+ if (task.event.is_none() || matches!(task.event, Some(Event::Cancelled)))
&& state.get_mut(set)?.ready.is_empty()
{
store.switch_or_trap_if_may_not_suspend(caller)?;
- if cancellable {
- let old = store
- .concurrent_state_mut()?
- .get_mut(guest_thread.thread)?
- .wake_on_cancel
- .replace(set);
- if !old.is_none() {
- bail_bug!("thread unexpectedly in a prior wake_on_cancel set");
- }
- }
-
store.suspend(SuspendReason::Waiting {
set,
thread: guest_thread,
@@ -4127,7 +4080,7 @@ impl Instance {
);
// Deliver any pending events to the guest and return.
- let event = self.get_event(store, guest_thread.task, Some(params.set), cancellable)?;
+ let event = self.get_event(store, guest_thread.task, Some(params.set), false)?;
let (ordinal, handle, result) = match &check {
WaitableCheck::Wait => {
@@ -4267,10 +4220,7 @@ impl Instance {
let set = state.get_mut(caller.thread)?.sync_call_set;
waitable.join(state, Some(set))?;
- store.suspend(SuspendReason::Yielding {
- thread: caller,
- cancellable: false,
- })?;
+ store.suspend(SuspendReason::Yielding { thread: caller })?;
let state = store.concurrent_state_mut()?;
waitable.join(state, None)?;
@@ -4310,19 +4260,6 @@ impl Instance {
yield_(store)?;
- break;
- } else if let GuestThreadState::Ready {
- cancellable: true, ..
- } = &thread_mut.state
- {
- // The thread is in a cancellable yield, so yield back
- // to it.
- if !concurrent_state.promote_thread_work_item(thread)? {
- bail_bug!("a ready thread should have been promotable");
- }
-
- yield_(store)?;
-
break;
}
}
@@ -4986,7 +4923,6 @@ enum GuestThreadState {
Suspended(StoreFiber<'static>),
Ready {
fiber: StoreFiber<'static>,
- cancellable: bool,
},
Completed,
}
@@ -4998,10 +4934,7 @@ impl fmt::Debug for GuestThreadState {
Self::NotStartedExplicit(_) => f.debug_tuple("NotStartedExplicit").finish(),
Self::Running => f.debug_tuple("Running").finish(),
Self::Suspended(_) => f.debug_tuple("Suspended").finish(),
- Self::Ready { cancellable, .. } => f
- .debug_struct("Ready")
- .field("cancellable", cancellable)
- .finish(),
+ Self::Ready { .. } => f.debug_struct("Ready").finish(),
Self::Completed => f.debug_tuple("Completed").finish(),
}
}
diff --git a/crates/wasmtime/src/runtime/vm/component/libcalls.rs b/crates/wasmtime/src/runtime/vm/component/libcalls.rs
index 295b253b75..d41b3e831f 100644
--- a/crates/wasmtime/src/runtime/vm/component/libcalls.rs
+++ b/crates/wasmtime/src/runtime/vm/component/libcalls.rs
@@ -1341,17 +1341,11 @@ fn thread_resume_later(
}
#[cfg(feature = "component-model-async")]
-fn thread_suspend(
- store: &mut dyn VMStore,
- instance: Instance,
- caller: u32,
- cancellable: u8,
-) -> Result<bool> {
+fn thread_suspend(store: &mut dyn VMStore, instance: Instance, caller: u32) -> Result<bool> {
instance
.suspension_intrinsic(
store,
RuntimeComponentInstanceIndex::from_u32(caller),
- cancellable != 0,
false,
SuspensionTarget::None,
)
@@ -1359,17 +1353,11 @@ fn thread_suspend(
}
#[cfg(feature = "component-model-async")]
-fn thread_yield(
- store: &mut dyn VMStore,
- instance: Instance,
- caller_instance: u32,
- cancellable: u8,
-) -> Result<bool> {
+fn thread_yield(store: &mut dyn VMStore, instance: Instance, caller_instance: u32) -> Result<bool> {
instance
.suspension_intrinsic(
store,
RuntimeComponentInstanceIndex::from_u32(caller_instance),
- cancellable != 0,
true,
SuspensionTarget::None,
)
@@ -1381,14 +1369,12 @@ fn thread_suspend_then_resume(
store: &mut dyn VMStore,
instance: Instance,
caller: u32,
- cancellable: u8,
thread_idx: u32,
) -> Result<bool> {
instance
.suspension_intrinsic(
store,
RuntimeComponentInstanceIndex::from_u32(caller),
- cancellable != 0,
false,
SuspensionTarget::Resume(thread_idx),
)
@@ -1400,14 +1386,12 @@ fn thread_yield_then_resume(
store: &mut dyn VMStore,
instance: Instance,
caller_instance: u32,
- cancellable: u8,
thread_idx: u32,
) -> Result<bool> {
instance
.suspension_intrinsic(
store,
RuntimeComponentInstanceIndex::from_u32(caller_instance),
- cancellable != 0,
true,
SuspensionTarget::Resume(thread_idx),
)
@@ -1419,14 +1403,12 @@ fn thread_suspend_then_promote(
store: &mut dyn VMStore,
instance: Instance,
caller: u32,
- cancellable: u8,
thread_idx: u32,
) -> Result<bool> {
instance
.suspension_intrinsic(
store,
RuntimeComponentInstanceIndex::from_u32(caller),
- cancellable != 0,
false,
SuspensionTarget::Promote(thread_idx),
)
@@ -1438,14 +1420,12 @@ fn thread_yield_then_promote(
store: &mut dyn VMStore,
instance: Instance,
caller: u32,
- cancellable: u8,
thread_idx: u32,
) -> Result<bool> {
instance
.suspension_intrinsic(
store,
RuntimeComponentInstanceIndex::from_u32(caller),
- cancellable != 0,
true,
SuspensionTarget::Promote(thread_idx),
)
diff --git a/crates/wit-bindgen/src/lib.rs b/crates/wit-bindgen/src/lib.rs
index e512c7eb3e..31fab6ea90 100644
--- a/crates/wit-bindgen/src/lib.rs
+++ b/crates/wit-bindgen/src/lib.rs
@@ -234,7 +234,7 @@ impl Opts {
}
let mut r = Wasmtime::default();
- r.sizes.fill(resolve);
+ r.sizes.fill(resolve)?;
r.opts = self.clone();
r.populate_world_and_interface_options(resolve, world);
r.generate(resolve, world)
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index fcb3242371..833114189c 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -4538,6 +4538,12 @@ criteria = "safe-to-deploy"
delta = "1.1.0 -> 2.0.0"
notes = "Chris Fallin reviewed this update with me, and we didn't find anything surprising. We did verify that the new constants did originate in the paper referenced."
+[[audits.rustc_version]]
+who = "Alex Crichton <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.4.0 -> 0.4.1"
+notes = "Minor changes, nothing worrisome"
+
[[audits.rustix]]
who = "Dan Gohman <[email protected]>"
criteria = "safe-to-deploy"
@@ -7309,7 +7315,7 @@ end = "2024-07-06"
criteria = "safe-to-deploy"
user-id = 3618 # David Tolnay (dtolnay)
start = "2022-01-04"
-end = "2025-05-06"
+end = "2027-09-10"
[[trusted.proc-macro2]]
criteria = "safe-to-deploy"
@@ -7453,7 +7459,7 @@ end = "2027-06-26"
criteria = "safe-to-deploy"
user-id = 3618 # David Tolnay (dtolnay)
start = "2019-03-01"
-end = "2025-12-02"
+end = "2027-09-10"
[[trusted.system-interface]]
criteria = "safe-to-deploy"
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index 530c914913..99854d332d 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -333,17 +333,17 @@ version = "0.7.3"
criteria = "safe-to-deploy"
[[exemptions.logos]]
-version = "0.14.2"
+version = "0.15.1"
criteria = "safe-to-deploy"
notes = "safe when forbid_unsafe feature enabled, which it is in our dep through wasm-wave"
[[exemptions.logos-codegen]]
-version = "0.14.2"
+version = "0.15.1"
criteria = "safe-to-deploy"
notes = "safe when forbid_unsafe feature enabled, which it is in our dep through wasm-wave"
[[exemptions.logos-derive]]
-version = "0.14.2"
+version = "0.15.1"
criteria = "safe-to-deploy"
notes = "safe when forbid_unsafe feature enabled, which it is in our dep through wasm-wave"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index edb6919deb..757e33d5e1 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -825,6 +825,13 @@ user-id = 4415
user-login = "philipc"
user-name = "Philip Craig"
+[[publisher.gimli]]
+version = "0.34.0"
+when = "2026-06-25"
+user-id = 4415
+user-login = "philipc"
+user-name = "Philip Craig"
+
[[publisher.h2]]
version = "0.4.16"
when = "2026-08-17"
@@ -950,8 +957,8 @@ user-login = "alexcrichton"
user-name = "Alex Crichton"
[[publisher.json-from-wast]]
-version = "0.258.0"
-when = "2026-08-24"
+version = "0.259.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.libc]]
@@ -986,8 +993,8 @@ when = "2025-11-16"
trusted-publisher = "github:JohnTitor/mach2"
[[publisher.macro-string]]
-version = "0.2.0"
-when = "2026-02-24"
+version = "0.3.0"
+when = "2026-07-18"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"
@@ -1062,6 +1069,13 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"
+[[publisher.prettyplease]]
+version = "0.3.0"
+when = "2026-07-18"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
[[publisher.proc-macro2]]
version = "1.0.101"
when = "2025-08-16"
@@ -1226,6 +1240,13 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"
+[[publisher.syn]]
+version = "3.0.5"
+when = "2026-09-04"
+user-id = 3618
+user-login = "dtolnay"
+user-name = "David Tolnay"
+
[[publisher.tar]]
version = "0.4.45"
when = "2026-03-19"
@@ -1423,8 +1444,8 @@ user-login = "alexcrichton"
user-name = "Alex Crichton"
[[publisher.wasm-compose]]
-version = "0.258.0"
-when = "2026-08-24"
+version = "0.259.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasm-encoder]]
@@ -1437,6 +1458,11 @@ version = "0.258.0"
when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasm-tools"
+[[publisher.wasm-encoder]]
+version = "0.259.0"
+when = "2026-09-10"
+trusted-publisher = "github:bytecodealliance/wasm-tools"
+
[[publisher.wasm-metadata]]
version = "0.236.0"
when = "2025-07-28"
@@ -1448,9 +1474,14 @@ version = "0.258.0"
when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasm-tools"
+[[publisher.wasm-metadata]]
+version = "0.259.0"
+when = "2026-09-10"
+trusted-publisher = "github:bytecodealliance/wasm-tools"
+
[[publisher.wasm-wave]]
-version = "0.258.0"
-when = "2026-08-24"
+version = "0.259.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasmparser]]
@@ -1463,9 +1494,14 @@ version = "0.258.0"
when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasm-tools"
+[[publisher.wasmparser]]
+version = "0.259.0"
+when = "2026-09-10"
+trusted-publisher = "github:bytecodealliance/wasm-tools"
+
[[publisher.wasmprinter]]
-version = "0.258.0"
-when = "2026-08-24"
+version = "0.259.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wasmtime]]
@@ -1619,13 +1655,13 @@ when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasmtime"
[[publisher.wast]]
-version = "258.0.0"
-when = "2026-08-24"
+version = "259.0.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wat]]
-version = "1.258.0"
-when = "2026-08-24"
+version = "1.259.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wasm-tools"
[[publisher.wiggle]]
@@ -1800,8 +1836,8 @@ when = "2026-01-12"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen]]
-version = "0.61.1"
-when = "2026-08-25"
+version = "0.62.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen-core]]
@@ -1810,8 +1846,8 @@ when = "2026-01-12"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen-core]]
-version = "0.61.1"
-when = "2026-08-25"
+version = "0.62.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen-rt]]
@@ -1826,8 +1862,8 @@ when = "2026-01-12"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen-rust]]
-version = "0.61.1"
-when = "2026-08-25"
+version = "0.62.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen-rust-macro]]
@@ -1836,8 +1872,8 @@ when = "2026-01-12"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-bindgen-rust-macro]]
-version = "0.61.1"
-when = "2026-08-25"
+version = "0.62.0"
+when = "2026-09-10"
trusted-publisher = "github:bytecodealliance/wit-bindgen"
[[publisher.wit-component]]
@@ -1850,6 +1886,11 @@ version = "0.258.0"
when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasm-tools"
+[[publisher.wit-component]]
+version = "0.259.0"
+when = "2026-09-10"
+trusted-publisher = "github:bytecodealliance/wasm-tools"
+
[[publisher.wit-parser]]
version = "0.244.0"
when = "2026-01-06"
@@ -1860,6 +1901,11 @@ version = "0.258.0"
when = "2026-08-24"
trusted-publisher = "github:bytecodealliance/wasm-tools"
+[[publisher.wit-parser]]
+version = "0.259.0"
+when = "2026-09-10"
+trusted-publisher = "github:bytecodealliance/wasm-tools"
+
[[publisher.witx]]
version = "0.9.1"
when = "2021-06-22"
@@ -3133,6 +3179,16 @@ delta = "1.1.0 -> 2.1.1"
notes = "Simple hashing crate, no unsafe code."
aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
+[[audits.mozilla.audits.rustc_version]]
+who = "Nika Layzell <[email protected]>"
+criteria = "safe-to-deploy"
+version = "0.4.0"
+notes = """
+Use of powerful capabilities is limited to invoking `rustc -vV` to get version
+information for parsing version information.
+"""
+aggregated-from = "https://raw.githubusercontent.com/mozilla/cargo-vet/main/supply-chain/audits.toml"
+
[[audits.mozilla.audits.rustversion]]
who = "Bobby Holley <[email protected]>"
criteria = "safe-to-deploy"
diff --git a/tests/all/component_model/fixed_length_list.rs b/tests/all/component_model/fixed_length_list.rs
index 8542673948..bc8d16112a 100644
--- a/tests/all/component_model/fixed_length_list.rs
+++ b/tests/all/component_model/fixed_length_list.rs
@@ -215,7 +215,7 @@ fn dynamic_fixed_length_list_nested_in_tuple() -> Result<()> {
(import "f" (func $f (result $t)))
(core module $mem (memory (export "memory") 1))
(core instance $memi (instantiate $mem))
- (core func $f2 (canon lower (func $f) (memory $memi "memory")))
+ (core func $f2 (canon lower (func $f) (memory (core memory $memi "memory"))))
(core module $m
(import "" "f" (func $f (param i32)))
(import "mem" "memory" (memory 1))
@@ -225,7 +225,7 @@ fn dynamic_fixed_length_list_nested_in_tuple() -> Result<()> {
)
(core instance $ci (export "f" (func $f2)))
(core instance $mi (instantiate $m (with "" (instance $ci)) (with "mem" (instance $memi))))
- (func (export "run") (result u32) (canon lift (core func $mi "run") (memory $memi "memory")))
+ (func (export "run") (result u32) (canon lift (core func $mi "run") (memory (core memory $memi "memory"))))
)
"#;
diff --git a/tests/disas/component-model/known-imported-adapter-memory.wat b/tests/disas/component-model/known-imported-adapter-memory.wat
index 13801169e8..2635e33e8c 100644
--- a/tests/disas/component-model/known-imported-adapter-memory.wat
+++ b/tests/disas/component-model/known-imported-adapter-memory.wat
@@ -22,8 +22,8 @@
(core instance $m (instantiate $M))
(func (export "f") (param "a" u32) (result (tuple u32 u32))
(canon lift (core func $m "f")
- (memory $m "mem")
- (realloc (func $m "realloc"))))
+ (memory (core memory $m "mem"))
+ (realloc (core func $m "realloc"))))
)
(instance $a (instantiate $A))
@@ -39,8 +39,8 @@
(core instance $mem (instantiate $Mem))
(core func $f' (canon lower (func $f)
- (memory $mem "mem")
- (realloc (func $mem "realloc"))))
+ (memory (core memory $mem "mem"))
+ (realloc (core func $mem "realloc"))))
(core module $N
(import "" "mem" (memory 1))
diff --git a/tests/disas/component-model/known-imported-canonical-abi-memory.wat b/tests/disas/component-model/known-imported-canonical-abi-memory.wat
index ccdbd9b03c..419768af36 100644
--- a/tests/disas/component-model/known-imported-canonical-abi-memory.wat
+++ b/tests/disas/component-model/known-imported-canonical-abi-memory.wat
@@ -22,8 +22,8 @@
(func (export "f") (param "s" string)
(canon lift (core func $m "f")
- (memory $m "mem")
- (realloc (func $m "realloc"))
+ (memory (core memory $m "mem"))
+ (realloc (core func $m "realloc"))
)
)
)
diff --git a/tests/misc_testsuite/component-model-threading/stackful-cancellation.wast b/tests/misc_testsuite/component-model-threading/stackful-cancellation.wast
deleted file mode 100644
index c1ccd1b12a..0000000000
--- a/tests/misc_testsuite/component-model-threading/stackful-cancellation.wast
+++ /dev/null
@@ -1,385 +0,0 @@
-;;! component_model_async = true
-;;! component_model_async_stackful = true
-;;! component_model_more_async_builtins = true
-;;! component_model_threading = true
-;;! reference_types = true
-
-;; Tests that cancellation works with the async threading intrinsics.
-;; Consists of two components, C and D. C implements functions that mix cancellable and uncancellable yields and suspensions.
-;; D calls these functions and cancels the resulting subtasks, ensuring that cancellation is only seen when expected.
-
-;; -- Component C --
-
-;; `run-yield`: Yields twice, first with an uncancellable yield, then with a cancellable yield.
-;; The caller cancels the subtask during the first yield, and ensures that the cancellation only takes effect
-;; on the second yield.
-
-;; `run-yield-then-resume`: Yields twice to a spawned thread, first with an uncancellable yield, then with a cancellable yield.
-;; A complication is that we can't guarantee that if the spawned thread yields, the supertask will be scheduled to
-;; cancel the subtask before the subtask's implicit thread is rescheduled. To handle this, the subtask's implicit
-;; thread first waits on a future to be written by the supertask, then yields to the spawned thread.
-
-;; `run-suspend`: More complex, because executing an uncancellable suspension requires another
-;; thread in the same subtask to explicitly wake it up. This is done by the subtask spawning a new thread that
-;; waits on a future to be written by the supertask, and then resumes the main thread once that happens.
-;; After setting up this thread, `run-suspend` performs an uncancellable suspend, then a cancellable suspend.
-;; The caller cancels the subtask during the first suspend, writes to the future to make the spawned thread
-;; resume the implicit thread, and ensures that the cancellation only takes effect on the second suspend.
-
-;; `run-suspend-then-resume`: Similar to `run-suspend`, but uses `thread.suspend-then-resume` instead of `thread.suspend`.
-
-;; -- Component D --
-
-;; `run-test`: Calls one of the functions in C based on a test id, cancels the resulting subtask, and ensures that
-;; cancellation is only seen when expected.
-
-;; `run`: Calls `run-test` for each of the functions in C.
-
-(component
- (component $C
- (type $FT (future))
- (core module $Memory (memory (export "mem") 1))
- (core instance $memory (instantiate $Memory))
- ;; Defines the table for the thread start functions, of which there are two
- (core module $libc
- (table (export "__indirect_function_table") 2 funcref))
- (core module $CM
- (import "" "mem" (memory 1))
- (import "" "task.cancel" (func $task-cancel))
- (import "" "thread.new-indirect" (func $thread-new-indirect (param i32 i32) (result i32)))
- (import "" "thread.suspend" (func $thread-suspend (result i32)))
- (import "" "thread.suspend-cancellable" (func $thread-suspend-cancellable (result i32)))
- (import "" "thread.yield-then-resume" (func $thread-yield-then-resume (param i32) (result i32)))
- (import "" "thread.yield-then-resume-cancellable" (func $thread-yield-then-resume-cancellable (param i32) (result i32)))
- (import "" "thread.suspend-then-resume" (func $thread-suspend-then-resume (param i32) (result i32)))
- (import "" "thread.suspend-then-resume-cancellable" (func $thread-suspend-then-resume-cancellable (param i32) (result i32)))
- (import "" "thread.yield" (func $thread-yield (result i32)))
- (import "" "thread.yield-cancellable" (func $thread-yield-cancellable (result i32)))
- (import "" "thread.index" (func $thread-index (result i32)))
- (import "" "thread.resume-later" (func $thread-resume-later (param i32)))
- (import "" "future.read" (func $future.read (param i32 i32) (result i32)))
- (import "" "waitable.join" (func $waitable.join (param i32 i32)))
- (import "" "waitable-set.new" (func $waitable-set.new (result i32)))
- (import "" "waitable-set.wait" (func $waitable-set.wait (param i32 i32) (result i32)))
- (import "libc" "__indirect_function_table" (table $indirect-function-table 2 funcref))
-
- ;; Indices into the function table for the thread start functions
- (global $wake-from-suspend-ftbl-idx i32 (i32.const 0))
- (global $just-yield-ftbl-idx i32 (i32.const 1))
-
- (func (export "run-yield")
- ;; Yield back to the caller, who will attempt to cancel us, but we won't see it
- ;; because we're using an uncancellable yield
- (if (i32.ne (call $thread-yield) (i32.const 0)) (then unreachable))
- ;; Yield back to the caller again. This time, we should receive the cancellation immediately.
- (if (i32.ne (call $thread-yield-cancellable) (i32.const 1)) (then unreachable))
- (call $task-cancel)
- )
-
- (func $wait-for-future-write (param i32)
- (local $ret i32)
- ;; Perform a future.read, which will block, waiting for the supertask to write
- (local.set $ret (call $future.read (local.get 0) (i32.const 0xba5eba11)))
- (if (i32.ne (i32.const 0 (; COMPLETED ;)) (local.get $ret))
- (then unreachable))
- )
-
- (func $wake-from-suspend (param i32)
- ;; Extract the thread index and future to wait on from the argument structure
- (local $thread-index i32) (local $future i32)
- (local.set $thread-index (i32.load offset=0 (local.get 0)))
- (local.set $future (i32.load offset=4 (local.get 0)))
-
- ;; Wait for the supertask to signal us to wake up suspended thread.
- (call $wait-for-future-write (local.get $future))
- ;; Resume the main thread, which is suspended in an uncancellable suspend
- (call $thread-resume-later (local.get $thread-index))
- )
-
- (func $just-yield (param $explicit-thread-idx i32)
- ;; Yield nondeterministically, either back to the supertask, who will then wait on cancellation to be acknowledged,
- ;; or to the implicit thread, who will acknowledge the cancellation.
- (if (i32.ne (call $thread-yield) (i32.const 0)) (then unreachable))
- )
-
- ;; Initialize the function table that will be used by thread.new-indirect
- (elem (table $indirect-function-table) (i32.const 0 (; wake-from-suspend-ftbl-idx ;)) func $wake-from-suspend)
- (elem (table $indirect-function-table) (i32.const 1 (; just-yield-ftbl-idx ;)) func $just-yield)
-
- (func (export "run-yield-then-resume") (param $futr i32)
- (local $thread-index i32)
- ;; Spawn a new thread that will wake us up from our uncancellable suspend; we'll switch to it next
- (local.set $thread-index
- (call $thread-new-indirect (global.get $just-yield-ftbl-idx) (call $thread-index)))
-
- ;; We can't guarantee that the supertask will be scheduled to cancel us before we're rescheduled, so we first
- ;; wait on the future to be written, then yield to the spawned thread. This means that cancellation will be
- ;; sent while we're waiting on the future rather than at the yield point, but the cancel will still be pending
- ;; when we reach the yield point, so it should still be ignored by the uncancellable yield and only take effect
- ;; when we reach the second, cancellable yield.
- (call $wait-for-future-write (local.get $futr))
-
- ;; Yield to the spawned thread uncancellably. We should eventually be rescheduled without being notified
- ;; of the pending cancellation.
- (if (i32.ne (call $thread-yield-then-resume (local.get $thread-index)) (i32.const 0)) (then unreachable))
- ;; Yield to the spawned thread again. This time we should see the cancellation immediately.
- (if (i32.ne (call $thread-yield-then-resume-cancellable (local.get $thread-index)) (i32.const 1)) (then unreachable))
- (call $task-cancel)
- )
-
- (func (export "run-suspend") (param $futr i32)
- ;; Set up the arguments for the wake-for-suspend thread start function.
- ;; It expects a pointer to a structure containing the thread index to resume
- ;; and the future to wait on before resuming it.
- (local $wake-from-suspend-argp i32)
- (local.set $wake-from-suspend-argp (i32.const 4))
- (i32.store offset=0 (local.get $wake-from-suspend-argp) (call $thread-index))
- (i32.store offset=4 (local.get $wake-from-suspend-argp) (local.get $futr))
-
- ;; Spawn a new thread that will wake us up from our uncancellable suspend and schedule
- ;; it to resume after we suspend.
- (call $thread-resume-later
- (call $thread-new-indirect (global.get $wake-from-suspend-ftbl-idx) (local.get $wake-from-suspend-argp)))
-
- ;; Request suspension. We will not be woken up by cancellation, because this is an uncancellable
- ;; suspend. We will be woken up by the other thread we spawned above, which will be resumed after
- ;; the supertask cancels our subtask.
- (if (i32.ne (call $thread-suspend) (i32.const 0)) (then unreachable))
- ;; Request suspension again. This time we should see the cancellation immediately.
- (if (i32.ne (call $thread-suspend-cancellable) (i32.const 1)) (then unreachable))
- (call $task-cancel)
- )
-
- (func (export "run-suspend-then-resume") (param $futr i32)
- (local $thread-index i32)
- ;; Set up the arguments for the wake-for-suspend thread start function.
- ;; It expects a pointer to a structure containing the thread index to resume
- ;; and the future to wait on before resuming it.
- (local $wake-from-suspend-argp i32)
- (local.set $wake-from-suspend-argp (i32.const 4))
- (i32.store offset=0 (local.get $wake-from-suspend-argp) (call $thread-index))
- (i32.store offset=4 (local.get $wake-from-suspend-argp) (local.get $futr))
-
- ;; Spawn a new thread that will wake us up from our uncancellable suspend; we'll switch to it next
- (local.set $thread-index
- (call $thread-new-indirect (global.get $wake-from-suspend-ftbl-idx) (local.get $wake-from-suspend-argp)))
-
- ;; Request suspension by switching to the spawned thread.
- ;; We will not be woken up by cancellation, because this is an uncancellable suspend.
- ;; We will be woken up by the other thread we spawned above, which will be resumed after
- ;; the supertask cancels our subtask.
- (if (i32.ne (call $thread-suspend-then-resume (local.get $thread-index)) (i32.const 0)) (then unreachable))
- ;; Request suspension again. This time we should see the cancellation immediately.
- (if (i32.ne (call $thread-suspend-then-resume-cancellable (local.get $thread-index)) (i32.const 1)) (then unreachable))
- (call $task-cancel)
- )
- )
-
- ;; Instantiate the libc module to get the table
- (core instance $libc (instantiate $libc))
- ;; Get access to `thread.new-indirect` that uses the table from libc
- (core type $start-func-ty (func (param i32)))
- (alias core export $libc "__indirect_function_table" (core table $indirect-function-table))
-
- (core func $task-cancel (canon task.cancel))
- (core func $thread-new-indirect
- (canon thread.new-indirect $start-func-ty (core table $indirect-function-table)))
- (core func $thread-yield (canon thread.yield))
- (core func $thread-yield-cancellable (canon thread.yield cancellable))
- (core func $thread-index (canon thread.index))
- (core func $thread-yield-then-resume (canon thread.yield-then-resume))
- (core func $thread-yield-then-resume-cancellable (canon thread.yield-then-resume cancellable))
- (core func $thread-resume-later (canon thread.resume-later))
- (core func $thread-suspend-then-resume (canon thread.suspend-then-resume))
- (core func $thread-suspend-then-resume-cancellable (canon thread.suspend-then-resume cancellable))
- (core func $thread-suspend (canon thread.suspend))
- (core func $thread-suspend-cancellable (canon thread.suspend cancellable))
- (core func $future.read (canon future.read $FT (memory (core memory $memory "mem"))))
- (core func $waitable-set.new (canon waitable-set.new))
- (core func $waitable.join (canon waitable.join))
- (core func $waitable-set.wait (canon waitable-set.wait (memory (core memory $memory "mem"))))
-
- ;; Instantiate the main module
- (core instance $cm (
- instantiate $CM
- (with "" (instance
- (export "mem" (memory $memory "mem"))
- (export "task.cancel" (func $task-cancel))
- (export "thread.new-indirect" (func $thread-new-indirect))
- (export "thread.index" (func $thread-index))
- (export "thread.yield-then-resume" (func $thread-yield-then-resume))
- (export "thread.yield-then-resume-cancellable" (func $thread-yield-then-resume-cancellable))
- (export "thread.yield" (func $thread-yield))
- (export "thread.yield-cancellable" (func $thread-yield-cancellable))
- (export "thread.suspend-then-resume" (func $thread-suspend-then-resume))
- (export "thread.suspend-then-resume-cancellable" (func $thread-suspend-then-resume-cancellable))
- (export "thread.suspend" (func $thread-suspend))
- (export "thread.suspend-cancellable" (func $thread-suspend-cancellable))
- (export "thread.resume-later" (func $thread-resume-later))
- (export "future.read" (func $future.read))
- (export "waitable.join" (func $waitable.join))
- (export "waitable-set.wait" (func $waitable-set.wait))
- (export "waitable-set.new" (func $waitable-set.new))))
- (with "libc" (instance $libc))))
-
- (func (export "run-yield") async (result u32) (canon lift (core func $cm "run-yield") async))
- (func (export "run-yield-then-resume") async (param "fut" $FT) (result u32) (canon lift (core func $cm "run-yield-then-resume") async))
- (func (export "run-suspend") async (param "fut" $FT) (result u32) (canon lift (core func $cm "run-suspend") async))
- (func (export "run-suspend-then-resume") async (param "fut" $FT) (result u32) (canon lift (core func $cm "run-suspend-then-resume") async))
- )
-
- (component $D
- (type $FT (future))
- (import "run-yield" (func $run-yield async (result u32)))
- (import "run-yield-then-resume" (func $run-yield-then-resume async (param "fut" $FT) (result u32)))
- (import "run-suspend" (func $run-suspend async (param "fut" $FT) (result u32)))
- (import "run-suspend-then-resume" (func $run-suspend-then-resume async (param "fut" $FT) (result u32)))
-
- (core module $Memory (memory (export "mem") 1))
- (core instance $memory (instantiate $Memory))
- (core module $DM
- (import "" "mem" (memory 1))
- (import "" "subtask.cancel" (func $subtask.cancel (param i32) (result i32)))
- (import "" "run-yield" (func $run-yield (param i32) (result i32)))
- (import "" "run-yield-then-resume" (func $run-yield-then-resume (param i32 i32) (result i32)))
- (import "" "run-suspend" (func $run-suspend (param i32 i32) (result i32)))
- (import "" "run-suspend-then-resume" (func $run-suspend-then-resume (param i32 i32) (result i32)))
- (import "" "waitable.join" (func $waitable.join (param i32 i32)))
- (import "" "waitable-set.new" (func $waitable-set.new (result i32)))
- (import "" "waitable-set.wait" (func $waitable-set.wait (param i32 i32) (result i32)))
- (import "" "future.new" (func $future.new (result i64)))
- (import "" "future.write" (func $future.write (param i32 i32) (result i32)))
- (import "" "thread.yield" (func $thread-yield (result i32)))
-
- (func $run-test (param $test-id i32) (result i32)
- (local $ret i32) (local $subtask i32)
- (local $ws i32) (local $event_code i32)
- (local $run-retp i32) (local $wait-retp i32)
- (local $ret64 i64) (local $futr i32) (local $futw i32)
-
- ;; Set up return value storage for run-suspend/suspend-then-resume and waitable-set.wait
- (local.set $run-retp (i32.const 4))
- (local.set $wait-retp (i32.const 8))
- (i32.store (local.get $run-retp) (i32.const 0xbad0bad0))
- (i32.store (local.get $wait-retp) (i32.const 0xbad0bad0))
-
- ;; Create a future that the subtask may wait on
- (local.set $ret64 (call $future.new))
- (local.set $futr (i32.wrap_i64 (local.get $ret64)))
- (local.set $futw (i32.wrap_i64 (i64.shr_u (local.get $ret64) (i64.const 32))))
-
- ;; Calling run-suspend/suspend-then-resume will start the thread, which will suspend.
- ;; This is basically a switch statement:
- ;; 0: run-yield
- ;; 1: run-yield-then-resume
- ;; 2: run-suspend
- ;; 3: run-suspend-then-resume
- (if (i32.eq (local.get $test-id) (i32.const 0))
- (then (local.set $ret (call $run-yield (local.get $run-retp))))
- (else (if (i32.eq (local.get $test-id) (i32.const 1))
- (then (local.set $ret (call $run-yield-then-resume (local.get $futr) (local.get $run-retp))))
- (else (if (i32.eq (local.get $test-id) (i32.const 2))
- (then (local.set $ret (call $run-suspend (local.get $futr) (local.get $run-retp))))
- (else (if (i32.eq (local.get $test-id) (i32.const 3))
- (then (local.set $ret (call $run-suspend-then-resume (local.get $futr) (local.get $run-retp))))
- (else unreachable))))))))
-
- ;; Ensure that the thread started
- (if (i32.ne (i32.and (local.get $ret) (i32.const 0xF)) (i32.const 1 (; STARTED ;)))
- (then unreachable))
- ;; Extract the subtask index
- (local.set $subtask (i32.shr_u (local.get $ret) (i32.const 4)))
- ;; Cancel the subtask, which should block, because the initial suspend/yield is uncancellable
- (local.set $ret (call $subtask.cancel (local.get $subtask)))
- ;; Ensure the cancellation blocked
- (if (i32.ne (local.get $ret) (i32.const -1 (; BLOCKED ;)))
- (then unreachable))
-
- ;; If we're not testing run-yield, the subtask is expecting a write to our future, so write to it
- (if (i32.ne (local.get $test-id) (i32.const 0))
- (then
- (local.set $ret (call $future.write (local.get $futw) (i32.const 0xdeadbeef)))
- ;; The write should succeed
- (if (i32.ne (i32.const 0 (; COMPLETED ;)) (local.get $ret))
- (then unreachable))))
-
- ;; Wait on the subtask, which will eventually progress to a cancellable yield/suspend and acknowledge the cancellation
- (local.set $ws (call $waitable-set.new))
- (call $waitable.join (local.get $subtask) (local.get $ws))
- (local.set $event_code (call $waitable-set.wait (local.get $ws) (local.get $wait-retp)))
- ;; Ensure we got the subtask event
- (if (i32.ne (local.get $event_code) (i32.const 1 (; SUBTASK ;)))
- (then unreachable))
- ;; Ensure the subtask index matches
- (if (i32.ne (local.get $subtask) (i32.load (local.get $wait-retp)))
- (then unreachable))
- ;; Ensure the subtask was cancelled before it returned
- (if (i32.ne (i32.const 4 (; CANCELLED_BEFORE_RETURNED=4 | (0<<4) ;))
- (i32.load offset=4 (local.get $wait-retp)))
- (then unreachable))
-
- ;; Return success
- (i32.const 42)
- )
-
- (func $run (export "run") (result i32)
- ;; test-id 0: run-yield
- (if (i32.ne (call $run-test (i32.const 0)) (i32.const 42))
- (then unreachable))
-
- ;; test-id 1: run-yield-then-resume
- (if (i32.ne (call $run-test (i32.const 1)) (i32.const 42))
- (then unreachable))
-
- ;; test-id 2: run-suspend
- (if (i32.ne (call $run-test (i32.const 2)) (i32.const 42))
- (then unreachable))
-
- ;; test-id 3: run-suspend-then-resume
- (if (i32.ne (call $run-test (i32.const 3)) (i32.const 42))
- (then unreachable))
-
- ;; Return success
- (i32.const 42)
- )
- )
-
- (core func $waitable-set.new (canon waitable-set.new))
- (core func $waitable-set.wait (canon waitable-set.wait (memory (core memory $memory "mem"))))
- (core func $waitable.join (canon waitable.join))
- (core func $subtask.cancel (canon subtask.cancel async))
- (core func $future.new (canon future.new $FT))
- (core func $future.write (canon future.write $FT (memory (core memory $memory "mem"))))
- (core func $thread.yield (canon thread.yield))
- (canon lower (func $run-yield) async (memory (core memory $memory "mem")) (core func $run-yield'))
- (canon lower (func $run-suspend) async (memory (core memory $memory "mem")) (core func $run-suspend'))
- (canon lower (func $run-suspend-then-resume) async (memory (core memory $memory "mem")) (core func $run-suspend-then-resume'))
- (canon lower (func $run-yield-then-resume) async (memory (core memory $memory "mem")) (core func $run-yield-then-resume'))
- (core instance $dm (instantiate $DM (with "" (instance
- (export "mem" (memory $memory "mem"))
- (export "run-yield" (func $run-yield'))
- (export "run-suspend" (func $run-suspend'))
- (export "run-suspend-then-resume" (func $run-suspend-then-resume'))
- (export "run-yield-then-resume" (func $run-yield-then-resume'))
- (export "waitable.join" (func $waitable.join))
- (export "waitable-set.new" (func $waitable-set.new))
- (export "waitable-set.wait" (func $waitable-set.wait))
- (export "subtask.cancel" (func $subtask.cancel))
- (export "future.new" (func $future.new))
- (export "future.write" (func $future.write))
- (export "thread.yield" (func $thread.yield))
- ))))
- (func (export "run") async (result u32) (canon lift (core func $dm "run")))
- )
-
- (instance $c (instantiate $C))
- (instance $d (instantiate $D
- (with "run-yield" (func $c "run-yield"))
- (with "run-yield-then-resume" (func $c "run-yield-then-resume"))
- (with "run-suspend" (func $c "run-suspend"))
- (with "run-suspend-then-resume" (func $c "run-suspend-then-resume"))
- ))
- (func (export "run") (alias export $d "run"))
-)
-
-(assert_return (invoke "run") (u32.const 42))
diff --git a/tests/misc_testsuite/component-model-threading/yield-cancellable.wast b/tests/misc_testsuite/component-model-threading/yield-cancellable.wast
index b74efa9f4b..e2b533c749 100644
--- a/tests/misc_testsuite/component-model-threading/yield-cancellable.wast
+++ b/tests/misc_testsuite/component-model-threading/yield-cancellable.wast
@@ -10,14 +10,14 @@
(canon thread.new-indirect $start-func-ty (core table $libc "t")))
(core func $thread.resume-later (canon thread.resume-later))
(core func $thread.index (canon thread.index))
- (core func $thread.yield-cancellable (canon thread.yield cancellable))
+ (core func $thread.yield (canon thread.yield))
(core func $task.return (canon task.return))
(core module $m
(import "" "thread.new-indirect" (func $thread.new-indirect (param i32 i32) (result i32)))
(import "" "thread.resume-later" (func $thread.resume-later (param i32)))
(import "" "thread.index" (func $thread.index (result i32)))
- (import "" "thread.yield-cancellable" (func $thread.yield-cancellable (result i32)))
+ (import "" "thread.yield" (func $thread.yield (result i32)))
(import "" "task.return" (func $task.return))
(import "" "tbl" (table $tbl 1 funcref))
@@ -29,10 +29,10 @@
i32.const 1 ;; CALLBACK_CODE_YIELD
)
- ;; thread: call `thread.yield-cancellable` and double-check it didn't pick
+ ;; thread: call `thread.yield` and double-check it didn't pick
;; up anything
(func $explicit-start (param $ctx i32)
- (if (call $thread.yield-cancellable)
+ (if (call $thread.yield)
(then (unreachable)))
)
(elem (table $tbl) (i32.const 0) func $explicit-start)
@@ -48,7 +48,7 @@
(export "thread.new-indirect" (func $thread.new-indirect))
(export "thread.resume-later" (func $thread.resume-later))
(export "thread.index" (func $thread.index))
- (export "thread.yield-cancellable" (func $thread.yield-cancellable))
+ (export "thread.yield" (func $thread.yield))
(export "task.return" (func $task.return))
(export "tbl" (table $libc "t"))))))
diff --git a/tests/misc_testsuite/component-model/alias-region-known-imported-adapter-memory.wast b/tests/misc_testsuite/component-model/alias-region-known-imported-adapter-memory.wast
index 80d85dde9c..ccc8d3aeda 100644
--- a/tests/misc_testsuite/component-model/alias-region-known-imported-adapter-memory.wast
+++ b/tests/misc_testsuite/component-model/alias-region-known-imported-adapter-memory.wast
@@ -25,8 +25,8 @@
(core instance $m (instantiate $M))
(func (export "f") (param "a" u32) (result (tuple u32 u32))
(canon lift (core func $m "f")
- (memory $m "mem")
- (realloc (func $m "realloc"))))
+ (memory (core memory $m "mem"))
+ (realloc (core func $m "realloc"))))
)
(instance $a (instantiate $A))
@@ -44,8 +44,8 @@
(core instance $mem (instantiate $Mem))
(core func $f' (canon lower (func $f)
- (memory $mem "mem")
- (realloc (func $mem "realloc"))))
+ (memory (core memory $mem "mem"))
+ (realloc (core func $mem "realloc"))))
(core module $N
(import "" "mem" (memory 1))
diff --git a/tests/misc_testsuite/component-model/alias-region-known-imported-canonical-abi-memory.wast b/tests/misc_testsuite/component-model/alias-region-known-imported-canonical-abi-memory.wast
index b61c1c8445..a3eab20cbc 100644
--- a/tests/misc_testsuite/component-model/alias-region-known-imported-canonical-abi-memory.wast
+++ b/tests/misc_testsuite/component-model/alias-region-known-imported-canonical-abi-memory.wast
@@ -44,8 +44,8 @@
(func (export "f") (param "s" string)
(canon lift (core func $m "f")
- (memory $m "mem")
- (realloc (func $m "realloc"))))
+ (memory (core memory $m "mem"))
+ (realloc (core func $m "realloc"))))
(func (export "get-len") (result u32)
(canon lift (core func $m "get-len")))
diff --git a/tests/misc_testsuite/component-model/async/stackful.wast b/tests/misc_testsuite/component-model/async/stackful.wast
index 6c7712f5fd..2edb4f11e2 100644
--- a/tests/misc_testsuite/component-model/async/stackful.wast
+++ b/tests/misc_testsuite/component-model/async/stackful.wast
@@ -113,7 +113,7 @@
(core module $m
(import "" "waitable-set.wait" (func $waitable-set-wait (param i32 i32) (result i32)))
)
- (core func $waitable-set-wait (canon waitable-set.wait cancellable (memory (core memory $libc "memory"))))
+ (core func $waitable-set-wait (canon waitable-set.wait (memory (core memory $libc "memory"))))
(core instance $i (instantiate $m (with "" (instance (export "waitable-set.wait" (func $waitable-set-wait))))))
)
@@ -124,7 +124,7 @@
(core module $m
(import "" "waitable-set.poll" (func $waitable-set-poll (param i32 i32) (result i32)))
)
- (core func $waitable-set-poll (canon waitable-set.poll cancellable (memory (core memory $libc "memory"))))
+ (core func $waitable-set-poll (canon waitable-set.poll (memory (core memory $libc "memory"))))
(core instance $i (instantiate $m (with "" (instance (export "waitable-set.poll" (func $waitable-set-poll))))))
)
@@ -133,6 +133,6 @@
(core module $m
(import "" "yield" (func $yield (result i32)))
)
- (core func $yield (canon thread.yield cancellable))
+ (core func $yield (canon thread.yield))
(core instance $i (instantiate $m (with "" (instance (export "yield" (func $yield))))))
)
diff --git a/tests/misc_testsuite/component-model/async/task-deletion.wast b/tests/misc_testsuite/component-model/async/task-deletion.wast
index 6e0b73a7d6..1bc5ef8b74 100644
--- a/tests/misc_testsuite/component-model/async/task-deletion.wast
+++ b/tests/misc_testsuite/component-model/async/task-deletion.wast
@@ -21,13 +21,9 @@
(import "" "task.cancel" (func $task-cancel))
(import "" "thread.new-indirect" (func $thread-new-indirect (param i32 i32) (result i32)))
(import "" "thread.suspend" (func $thread-suspend (result i32)))
- (import "" "thread.suspend-cancellable" (func $thread-suspend-cancellable (result i32)))
(import "" "thread.yield-then-resume" (func $thread-yield-then-resume (param i32) (result i32)))
- (import "" "thread.yield-then-resume-cancellable" (func $thread-yield-then-resume-cancellable (param i32) (result i32)))
(import "" "thread.suspend-then-promote" (func $thread-suspend-then-promote (param i32) (result i32)))
- (import "" "thread.suspend-then-promote-cancellable" (func $thread-suspend-then-promote-cancellable (param i32) (result i32)))
(import "" "thread.yield" (func $thread-yield (result i32)))
- (import "" "thread.yield-cancellable" (func $thread-yield-cancellable (result i32)))
(import "" "thread.index" (func $thread-index (result i32)))
(import "" "thread.resume-later" (func $thread-resume-later (param i32)))
(import "" "waitable.join" (func $waitable.join (param i32 i32)))
@@ -112,15 +108,11 @@
(core func $thread-new-indirect
(canon thread.new-indirect $start-func-ty (core table $indirect-function-table)))
(core func $thread-yield (canon thread.yield))
- (core func $thread-yield-cancellable (canon thread.yield cancellable))
(core func $thread-index (canon thread.index))
(core func $thread-yield-then-resume (canon thread.yield-then-resume))
- (core func $thread-yield-then-resume-cancellable (canon thread.yield-then-resume cancellable))
(core func $thread-resume-later (canon thread.resume-later))
(core func $thread-suspend-then-promote (canon thread.suspend-then-promote))
- (core func $thread-suspend-then-promote-cancellable (canon thread.suspend-then-promote cancellable))
(core func $thread-suspend (canon thread.suspend))
- (core func $thread-suspend-cancellable (canon thread.suspend cancellable))
(core func $waitable-set.new (canon waitable-set.new))
(core func $waitable.join (canon waitable.join))
(core func $waitable-set.wait (canon waitable-set.wait (memory (core memory $memory "mem"))))
@@ -135,13 +127,9 @@
(export "thread.new-indirect" (func $thread-new-indirect))
(export "thread.index" (func $thread-index))
(export "thread.yield-then-resume" (func $thread-yield-then-resume))
- (export "thread.yield-then-resume-cancellable" (func $thread-yield-then-resume-cancellable))
(export "thread.yield" (func $thread-yield))
- (export "thread.yield-cancellable" (func $thread-yield-cancellable))
(export "thread.suspend-then-promote" (func $thread-suspend-then-promote))
- (export "thread.suspend-then-promote-cancellable" (func $thread-suspend-then-promote-cancellable))
(export "thread.suspend" (func $thread-suspend))
- (export "thread.suspend-cancellable" (func $thread-suspend-cancellable))
(export "thread.resume-later" (func $thread-resume-later))
(export "waitable.join" (func $waitable.join))
(export "waitable-set.wait" (func $waitable-set.wait))