Merge with upstream up to 60fc557 (#248)

Cargo.toml

@@ -161,7 +161,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "27.0.0"
+version = "28.0.0"
 authors = ["The Wasmtime Project Developers"]
 edition = "2021"
 # Wasmtime's current policy is that this number can be no larger than the
@@ -196,61 +196,61 @@ unnecessary_cast = 'warn'
 
 [workspace.dependencies]
 arbitrary = { version = "1.3.1" }
-wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=27.0.0" }
-wasmtime = { path = "crates/wasmtime", version = "27.0.0", default-features = false }
-wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=27.0.0" }
-wasmtime-cache = { path = "crates/cache", version = "=27.0.0" }
-wasmtime-cli-flags = { path = "crates/cli-flags", version = "=27.0.0" }
-wasmtime-cranelift = { path = "crates/cranelift", version = "=27.0.0" }
-wasmtime-continuations = { path = "crates/continuations", version = "=27.0.0" }
-wasmtime-winch = { path = "crates/winch", version = "=27.0.0" }
-wasmtime-environ = { path = "crates/environ", version = "=27.0.0" }
-wasmtime-explorer = { path = "crates/explorer", version = "=27.0.0" }
-wasmtime-fiber = { path = "crates/fiber", version = "=27.0.0" }
-wasmtime-jit-debug = { path = "crates/jit-debug", version = "=27.0.0" }
-wasmtime-wast = { path = "crates/wast", version = "=27.0.0" }
-wasmtime-wasi = { path = "crates/wasi", version = "27.0.0", default-features = false }
-wasmtime-wasi-http = { path = "crates/wasi-http", version = "=27.0.0", default-features = false }
-wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "27.0.0" }
-wasmtime-wasi-config = { path = "crates/wasi-config", version = "27.0.0" }
-wasmtime-wasi-keyvalue = { path = "crates/wasi-keyvalue", version = "27.0.0" }
-wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "27.0.0" }
-wasmtime-component-util = { path = "crates/component-util", version = "=27.0.0" }
-wasmtime-component-macro = { path = "crates/component-macro", version = "=27.0.0" }
-wasmtime-asm-macros = { path = "crates/asm-macros", version = "=27.0.0" }
-wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=27.0.0" }
-wasmtime-slab = { path = "crates/slab", version = "=27.0.0" }
+wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=28.0.0" }
+wasmtime = { path = "crates/wasmtime", version = "28.0.0", default-features = false }
+wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=28.0.0" }
+wasmtime-cache = { path = "crates/cache", version = "=28.0.0" }
+wasmtime-cli-flags = { path = "crates/cli-flags", version = "=28.0.0" }
+wasmtime-cranelift = { path = "crates/cranelift", version = "=28.0.0" }
+wasmtime-continuations = { path = "crates/continuations", version = "=28.0.0" }
+wasmtime-winch = { path = "crates/winch", version = "=28.0.0" }
+wasmtime-environ = { path = "crates/environ", version = "=28.0.0" }
+wasmtime-explorer = { path = "crates/explorer", version = "=28.0.0" }
+wasmtime-fiber = { path = "crates/fiber", version = "=28.0.0" }
+wasmtime-jit-debug = { path = "crates/jit-debug", version = "=28.0.0" }
+wasmtime-wast = { path = "crates/wast", version = "=28.0.0" }
+wasmtime-wasi = { path = "crates/wasi", version = "28.0.0", default-features = false }
+wasmtime-wasi-http = { path = "crates/wasi-http", version = "=28.0.0", default-features = false }
+wasmtime-wasi-nn = { path = "crates/wasi-nn", version = "28.0.0" }
+wasmtime-wasi-config = { path = "crates/wasi-config", version = "28.0.0" }
+wasmtime-wasi-keyvalue = { path = "crates/wasi-keyvalue", version = "28.0.0" }
+wasmtime-wasi-threads = { path = "crates/wasi-threads", version = "28.0.0" }
+wasmtime-component-util = { path = "crates/component-util", version = "=28.0.0" }
+wasmtime-component-macro = { path = "crates/component-macro", version = "=28.0.0" }
+wasmtime-asm-macros = { path = "crates/asm-macros", version = "=28.0.0" }
+wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", version = "=28.0.0" }
+wasmtime-slab = { path = "crates/slab", version = "=28.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 = "=27.0.0", default-features = false }
-wiggle-macro = { path = "crates/wiggle/macro", version = "=27.0.0" }
-wiggle-generate = { path = "crates/wiggle/generate", version = "=27.0.0" }
-wasi-common = { path = "crates/wasi-common", version = "=27.0.0", default-features = false }
+wiggle = { path = "crates/wiggle", version = "=28.0.0", default-features = false }
+wiggle-macro = { path = "crates/wiggle/macro", version = "=28.0.0" }
+wiggle-generate = { path = "crates/wiggle/generate", version = "=28.0.0" }
+wasi-common = { path = "crates/wasi-common", version = "=28.0.0", default-features = false }
 wasmtime-fuzzing = { path = "crates/fuzzing" }
-wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=27.0.0" }
-wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=27.0.0" }
+wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=28.0.0" }
+wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=28.0.0" }
 test-programs-artifacts = { path = 'crates/test-programs/artifacts' }
 
-pulley-interpreter = { path = 'pulley', version = "=27.0.0" }
+pulley-interpreter = { path = 'pulley', version = "=28.0.0" }
 pulley-interpreter-fuzz = { path = 'pulley/fuzz' }
 
-cranelift-codegen = { path = "cranelift/codegen", version = "0.114.0", default-features = false, features = ["std", "unwind"] }
-cranelift-frontend = { path = "cranelift/frontend", version = "0.114.0" }
-cranelift-entity = { path = "cranelift/entity", version = "0.114.0" }
-cranelift-native = { path = "cranelift/native", version = "0.114.0" }
-cranelift-module = { path = "cranelift/module", version = "0.114.0" }
-cranelift-interpreter = { path = "cranelift/interpreter", version = "0.114.0" }
-cranelift-reader = { path = "cranelift/reader", version = "0.114.0" }
+cranelift-codegen = { path = "cranelift/codegen", version = "0.115.0", default-features = false, features = ["std", "unwind"] }
+cranelift-frontend = { path = "cranelift/frontend", version = "0.115.0" }
+cranelift-entity = { path = "cranelift/entity", version = "0.115.0" }
+cranelift-native = { path = "cranelift/native", version = "0.115.0" }
+cranelift-module = { path = "cranelift/module", version = "0.115.0" }
+cranelift-interpreter = { path = "cranelift/interpreter", version = "0.115.0" }
+cranelift-reader = { path = "cranelift/reader", version = "0.115.0" }
 cranelift-filetests = { path = "cranelift/filetests" }
-cranelift-object = { path = "cranelift/object", version = "0.114.0" }
-cranelift-jit = { path = "cranelift/jit", version = "0.114.0" }
+cranelift-object = { path = "cranelift/object", version = "0.115.0" }
+cranelift-jit = { path = "cranelift/jit", version = "0.115.0" }
 cranelift-fuzzgen = { path = "cranelift/fuzzgen" }
-cranelift-bforest = { path = "cranelift/bforest", version = "0.114.0" }
-cranelift-bitset = { path = "cranelift/bitset", version = "0.114.0" }
-cranelift-control = { path = "cranelift/control", version = "0.114.0" }
-cranelift = { path = "cranelift/umbrella", version = "0.114.0" }
+cranelift-bforest = { path = "cranelift/bforest", version = "0.115.0" }
+cranelift-bitset = { path = "cranelift/bitset", version = "0.115.0" }
+cranelift-control = { path = "cranelift/control", version = "0.115.0" }
+cranelift = { path = "cranelift/umbrella", version = "0.115.0" }
 
-winch-codegen = { path = "winch/codegen", version = "=27.0.0" }
+winch-codegen = { path = "winch/codegen", version = "=28.0.0" }
 
 wasi-preview1-component-adapter = { path = "crates/wasi-preview1-component-adapter" }
 byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-array-literals" }
@@ -261,12 +261,12 @@ regalloc2 = "0.10.2"
 
 # cap-std family:
 target-lexicon = "0.12.16"
-cap-std = "3.3.0"
-cap-rand = { version = "3.3.0", features = ["small_rng"] }
-cap-fs-ext = "3.3.0"
-cap-net-ext = "3.3.0"
-cap-time-ext = "3.3.0"
-cap-tempfile = "3.3.0"
+cap-std = "3.4.1"
+cap-rand = { version = "3.4.1", features = ["small_rng"] }
+cap-fs-ext = "3.4.1"
+cap-net-ext = "3.4.1"
+cap-time-ext = "3.4.1"
+cap-tempfile = "3.4.1"
 fs-set-times = "0.20.1"
 system-interface = { version = "0.27.1", features = ["cap_std_impls"] }
 io-lifetimes = { version = "2.0.3", default-features = false }
@@ -414,6 +414,7 @@ all-arch = ["wasmtime/all-arch"]
 winch = ["wasmtime/winch"]
 pulley = ["wasmtime/pulley"]
 wmemcheck = ["wasmtime/wmemcheck"]
+trace-log = ["wasmtime/trace-log"]
 memory-protection-keys = ["wasmtime-cli-flags/memory-protection-keys"]
 
 # This feature, when enabled, will statically compile out all logging statements

RELEASES.md

@@ -1,4 +1,4 @@
-## 27.0.0
+## 28.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 -->
+* [27.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-27.0.0/RELEASES.md)
 * [26.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-26.0.0/RELEASES.md)
 * [25.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-25.0.0/RELEASES.md)
 * [24.0.x](https://github.com/bytecodealliance/wasmtime/blob/release-24.0.0/RELEASES.md)

benches/instantiation.rs

@@ -24,6 +24,7 @@ fn benchmark_name(strategy: &InstanceAllocationStrategy) -> &'static str {
     match strategy {
         InstanceAllocationStrategy::OnDemand => "default",
         InstanceAllocationStrategy::Pooling { .. } => "pooling",
+        _ => unreachable!(),
     }
 }
 

cranelift/bforest/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-bforest"
-version = "0.114.0"
+version = "0.115.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.114.0"
+version = "0.115.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.114.0"
+version = "0.115.0"
 description = "Low-level code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://docs.rs/cranelift-codegen"
@@ -24,7 +24,7 @@ features = ["all-arch"]
 anyhow = { workspace = true, optional = true, features = ['std'] }
 bumpalo = "3"
 capstone = { workspace = true, optional = true }
-cranelift-codegen-shared = { path = "./shared", version = "0.114.0" }
+cranelift-codegen-shared = { path = "./shared", version = "0.115.0" }
 cranelift-entity = { workspace = true }
 cranelift-bforest = { workspace = true }
 cranelift-bitset = { workspace = true }
@@ -53,8 +53,8 @@ similar = "2.1.0"
 env_logger = { workspace = true }
 
 [build-dependencies]
-cranelift-codegen-meta = { path = "meta", version = "0.114.0" }
-cranelift-isle = { path = "../isle/isle", version = "=0.114.0" }
+cranelift-codegen-meta = { path = "meta", version = "0.115.0" }
+cranelift-isle = { path = "../isle/isle", version = "=0.115.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.114.0"
+version = "0.115.0"
 description = "Metaprogram for cranelift-codegen code generator library"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/bytecodealliance/wasmtime"
@@ -16,4 +16,4 @@ workspace = true
 rustdoc-args = [ "--document-private-items" ]
 
 [dependencies]
-cranelift-codegen-shared = { path = "../shared", version = "0.114.0" }
+cranelift-codegen-shared = { path = "../shared", version = "0.115.0" }

cranelift/codegen/shared/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-codegen-shared"
-version = "0.114.0"
+version = "0.115.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/codegen/src/lib.rs

@@ -99,7 +99,7 @@ pub mod incremental_cache;
 #[macro_export]
 macro_rules! trace {
     ($($tt:tt)*) => {
-        if cfg!(feature = "trace-log") {
+        if cfg!(any(feature = "trace-log", debug_assertions)) {
             ::log::trace!($($tt)*);
         }
     };

cranelift/control/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["The Cranelift Project Developers"]
 name = "cranelift-control"
-version = "0.114.0"
+version = "0.115.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.114.0"
+version = "0.115.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.114.0"
+version = "0.115.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.114.0"
+version = "0.115.0"
 authors = ["The Cranelift Project Developers"]
 description = "Interpret Cranelift IR"
 repository = "https://github.com/bytecodealliance/wasmtime"