Merge with upstream (#204)

Cargo.toml

@@ -155,7 +155,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "23.0.0"
+version = "24.0.0"
 authors = ["The Wasmtime Project Developers"]
 edition = "2021"
 # Wasmtime's current policy is that this number can be no larger than the
@@ -178,58 +178,58 @@ all = 'allow'
 
 [workspace.dependencies]
 arbitrary = { version = "1.3.1" }
-wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=23.0.0" }
-wasmtime = { path = "crates/wasmtime", version = "23.0.0", default-features = false }
-wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=23.0.0" }
-wasmtime-cache = { path = "crates/cache", version = "=23.0.0" }
-wasmtime-cli-flags = { path = "crates/cli-flags", version = "=23.0.0" }
-wasmtime-cranelift = { path = "crates/cranelift", version = "=23.0.0" }
-wasmtime-continuations = { path = "crates/continuations", version = "=23.0.0" }
-wasmtime-winch = { path = "crates/winch", version = "=23.0.0" }
-wasmtime-environ = { path = "crates/environ", version = "=23.0.0" }
-wasmtime-explorer = { path = "crates/explorer", version = "=23.0.0" }
-wasmtime-fiber = { path = "crates/fiber", version = "=23.0.0" }
-wasmtime-types = { path = "crates/types", version = "23.0.0" }
-wasmtime-jit-debug = { path = "crates/jit-debug", version = "=23.0.0" }
-wasmtime-wast = { path = "crates/wast", version = "=23.0.0" }
-wasmtime-wasi = { path = "crates/wasi", version = "23.0.0", default-features = false }
-wasmtime-wasi-http = { path = "crates/wasi-http", version = "=23.0.0", default-features = false }
-wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "23.0.0" }
-wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "23.0.0" }
-wasmtime-component-util = { path = "crates/component-util", version = "=23.0.0" }
-wasmtime-component-macro = { path = "crates/component-macro", version = "=23.0.0" }
-wasmtime-asm-macros = { path = "crates/asm-macros", version = "=23.0.0" }
-wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=23.0.0" }
-wasmtime-slab = { path = "crates/slab", version = "=23.0.0" }
+wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=24.0.0" }
+wasmtime = { path = "crates/wasmtime", version = "24.0.0", default-features = false }
+wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=24.0.0" }
+wasmtime-cache = { path = "crates/cache", version = "=24.0.0" }
+wasmtime-cli-flags = { path = "crates/cli-flags", version = "=24.0.0" }
+wasmtime-cranelift = { path = "crates/cranelift", version = "=24.0.0" }
+wasmtime-continuations = { path = "crates/continuations", version = "=24.0.0" }
+wasmtime-winch = { path = "crates/winch", version = "=24.0.0" }
+wasmtime-environ = { path = "crates/environ", version = "=24.0.0" }
+wasmtime-explorer = { path = "crates/explorer", version = "=24.0.0" }
+wasmtime-fiber = { path = "crates/fiber", version = "=24.0.0" }
+wasmtime-types = { path = "crates/types", version = "24.0.0" }
+wasmtime-jit-debug = { path = "crates/jit-debug", version = "=24.0.0" }
+wasmtime-wast = { path = "crates/wast", version = "=24.0.0" }
+wasmtime-wasi = { path = "crates/wasi", version = "24.0.0", default-features = false }
+wasmtime-wasi-http = { path = "crates/wasi-http", version = "=24.0.0", default-features = false }
+wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "24.0.0" }
+wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "24.0.0" }
+wasmtime-component-util = { path = "crates/component-util", version = "=24.0.0" }
+wasmtime-component-macro = { path = "crates/component-macro", version = "=24.0.0" }
+wasmtime-asm-macros = { path = "crates/asm-macros", version = "=24.0.0" }
+wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=24.0.0" }
+wasmtime-slab = { path = "crates/slab", version = "=24.0.0" }
 component-test-util = { path = "crates/misc/component-test-util" }
 component-fuzz-util = { path = "crates/misc/component-fuzz-util" }
-wiggle = { path = "crates/wiggle", version = "=23.0.0", default-features = false }
-wiggle-macro = { path = "crates/wiggle/macro", version = "=23.0.0" }
-wiggle-generate = { path = "crates/wiggle/generate", version = "=23.0.0" }
-wasi-common = { path = "crates/wasi-common", version = "=23.0.0", default-features = false }
+wiggle = { path = "crates/wiggle", version = "=24.0.0", default-features = false }
+wiggle-macro = { path = "crates/wiggle/macro", version = "=24.0.0" }
+wiggle-generate = { path = "crates/wiggle/generate", version = "=24.0.0" }
+wasi-common = { path = "crates/wasi-common", version = "=24.0.0", default-features = false }
 wasmtime-fuzzing = { path = "crates/fuzzing" }
-wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=23.0.0" }
-wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=23.0.0" }
+wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=24.0.0" }
+wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=24.0.0" }
 test-programs-artifacts = { path = 'crates/test-programs/artifacts' }
 
-cranelift-wasm = { path = "cranelift/wasm", version = "0.110.0" }
-cranelift-codegen = { path = "cranelift/codegen", version = "0.110.0", default-features = false, features = ["std", "unwind", "trace-log"] }
-cranelift-frontend = { path = "cranelift/frontend", version = "0.110.0" }
-cranelift-entity = { path = "cranelift/entity", version = "0.110.0" }
-cranelift-native = { path = "cranelift/native", version = "0.110.0" }
-cranelift-module = { path = "cranelift/module", version = "0.110.0" }
-cranelift-interpreter = { path = "cranelift/interpreter", version = "0.110.0" }
-cranelift-reader = { path = "cranelift/reader", version = "0.110.0" }
+cranelift-wasm = { path = "cranelift/wasm", version = "0.111.0" }
+cranelift-codegen = { path = "cranelift/codegen", version = "0.111.0", default-features = false, features = ["std", "unwind", "trace-log"] }
+cranelift-frontend = { path = "cranelift/frontend", version = "0.111.0" }
+cranelift-entity = { path = "cranelift/entity", version = "0.111.0" }
+cranelift-native = { path = "cranelift/native", version = "0.111.0" }
+cranelift-module = { path = "cranelift/module", version = "0.111.0" }
+cranelift-interpreter = { path = "cranelift/interpreter", version = "0.111.0" }
+cranelift-reader = { path = "cranelift/reader", version = "0.111.0" }
 cranelift-filetests = { path = "cranelift/filetests" }
-cranelift-object = { path = "cranelift/object", version = "0.110.0" }
-cranelift-jit = { path = "cranelift/jit", version = "0.110.0" }
+cranelift-object = { path = "cranelift/object", version = "0.111.0" }
+cranelift-jit = { path = "cranelift/jit", version = "0.111.0" }
 cranelift-fuzzgen = { path = "cranelift/fuzzgen" }
-cranelift-bforest = { path = "cranelift/bforest", version = "0.110.0" }
-cranelift-bitset = { path = "cranelift/bitset", version = "0.110.0" }
-cranelift-control = { path = "cranelift/control", version = "0.110.0" }
-cranelift = { path = "cranelift/umbrella", version = "0.110.0" }
+cranelift-bforest = { path = "cranelift/bforest", version = "0.111.0" }
+cranelift-bitset = { path = "cranelift/bitset", version = "0.111.0" }
+cranelift-control = { path = "cranelift/control", version = "0.111.0" }
+cranelift = { path = "cranelift/umbrella", version = "0.111.0" }
 
-winch-codegen = { path = "winch/codegen", version = "=0.21.0" }
+winch-codegen = { path = "winch/codegen", version = "=0.22.0" }
 
 wasi-preview1-component-adapter = { path = "crates/wasi-preview1-component-adapter" }
 byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-array-literals" }

RELEASES.md

@@ -1,4 +1,4 @@
-## 23.0.0
+## 24.0.0
 
 Unreleased.
 
@@ -12,6 +12,7 @@ Release notes for previous releases of Wasmtime can be found on the respective
 release branches of the Wasmtime repository.
 
 <!-- ARCHIVE_START -->
+* [23.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-23.0.0/RELEASES.md)
 * [22.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-22.0.0/RELEASES.md)
 * [21.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-21.0.0/RELEASES.md)
 * [20.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-20.0.0/RELEASES.md)

cranelift/bforest/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-bforest"
-version = "0.110.0"
+version = "0.111.0"
 description = "A forest of B+-trees"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-bforest"

cranelift/bitset/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-bitset"
-version = "0.110.0"
+version = "0.111.0"
 description = "Various bitset stuff for use inside Cranelift"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-bitset"

cranelift/codegen/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen"
-version = "0.110.0"
+version = "0.111.0"
 description = "Low-level code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-codegen"
@@ -19,7 +19,7 @@ workspace = true
 anyhow = { workspace = true, optional = true, features = ['std'] }
 bumpalo = "3"
 capstone = { workspace = true, optional = true }
-cranelift-codegen-shared = { path = "./shared", version = "0.110.0" }
+cranelift-codegen-shared = { path = "./shared", version = "0.111.0" }
 cranelift-entity = { workspace = true }
 cranelift-bforest = { workspace = true }
 cranelift-bitset = { workspace = true }
@@ -47,8 +47,8 @@ similar = "2.1.0"
 env_logger = { workspace = true }
 
 [build-dependencies]
-cranelift-codegen-meta = { path = "meta", version = "0.110.0" }
-cranelift-isle = { path = "../isle/isle", version = "=0.110.0" }
+cranelift-codegen-meta = { path = "meta", version = "0.111.0" }
+cranelift-isle = { path = "../isle/isle", version = "=0.111.0" }
 
 [features]
 default = ["std", "unwind", "host-arch", "timing"]

cranelift/codegen/meta/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "cranelift-codegen-meta"
 authors = ["The Cranelift Project Developers"]
-version = "0.110.0"
+version = "0.111.0"
 description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -15,4 +15,4 @@ workspace = true
 rustdoc-args = [ "--document-private-items" ]
 
 [dependencies]
-cranelift-codegen-shared = { path = "../shared", version = "0.110.0" }
+cranelift-codegen-shared = { path = "../shared", version = "0.111.0" }

cranelift/codegen/shared/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen-shared"
-version = "0.110.0"
+version = "0.111.0"
 description = "For code shared between cranelift-codegen-meta and cranelift-codegen"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/control/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-control"
-version = "0.110.0"
+version = "0.111.0"
 description = "White-box fuzz testing framework"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/entity/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-entity"
-version = "0.110.0"
+version = "0.111.0"
 description = "Data structures using entity references as mapping keys"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-entity"

cranelift/frontend/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-frontend"
-version = "0.110.0"
+version = "0.111.0"
 description = "Cranelift IR builder helper"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-frontend"

cranelift/interpreter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-interpreter"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "Interpret Cranelift IR"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/isle/isle/Cargo.toml

@@ -6,7 +6,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 name = "cranelift-isle"
 readme = "../README.md"
 repository = "https://github.com/bytecodealliance/wasmtime/tree/main/cranelift/isle"
-version = "0.110.0"
+version = "0.111.0"
 
 [lints]
 workspace = true

cranelift/jit/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-jit"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "A JIT library backed by Cranelift"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/module/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-module"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for linking functions and data with Cranelift"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-native"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "Support for targeting the host with Cranelift"
 documentation = "https://docs.rs/cranelift-native"

cranelift/object/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-object"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "Emit Cranelift output to native object files with `object`"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/reader/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-reader"
-version = "0.110.0"
+version = "0.111.0"
 description = "Cranelift textual IR reader"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-reader"

cranelift/serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-serde"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "Serializer/Deserializer for Cranelift IR"
 repository = "https://github.com/bytecodealliance/wasmtime"

cranelift/umbrella/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift"
-version = "0.110.0"
+version = "0.111.0"
 description = "Umbrella for commonly-used cranelift crates"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift"

cranelift/wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cranelift-wasm"
-version = "0.110.0"
+version = "0.111.0"
 authors = ["The Cranelift Project Developers"]
 description = "Translator from WebAssembly to Cranelift IR"
 documentation = "https://docs.rs/cranelift-wasm"

crates/c-api/include/wasmtime.h

@@ -206,11 +206,11 @@
 /**
  * \brief Wasmtime version string.
  */
-#define WASMTIME_VERSION "23.0.0"
+#define WASMTIME_VERSION "24.0.0"
 /**
  * \brief Wasmtime major version number.
  */
-#define WASMTIME_VERSION_MAJOR 23
+#define WASMTIME_VERSION_MAJOR 24
 /**
  * \brief Wasmtime minor version number.
  */