From 7cba87e0dd5278895b91fea744c75ace3b6bbab1 Mon Sep 17 00:00:00 2001 From: kp2pml30 Date: Fri, 2 Oct 2026 22:16:36 +0900 Subject: [PATCH] =?UTF-8?q?build(deps):=20bump=20wasmtime=20to=2048.0.3=20?= =?UTF-8?q?=E2=AC=86=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rebase the wasmtime patch series onto v48.0.3, which fixes GHSA-jqpg-j7w6-42pr and GHSA-m63x-6p34-q65x; the executor reaches neither, as it runs without fuel and outside the component model - The stack-limit restore in catch blocks now follows upstream's new fuel reload; the patches are otherwise unchanged --- .git-third-party/manifest.json | 12 ++-- .../{r6518c8dxghpkhsj => fvfcbfxe3ng3djg8} | 8 +-- .../{zsjxmza3dms0hr10 => mgz066ws46rvhghv} | 2 +- .../{6xy06vg0d71czwmm => nwdw669v5p3aamta} | 18 +++--- .../{gbm0xv16dc1fs2km => wyqzzn2hxndgbxbx} | 26 ++++---- .../{4rr93pqjtwm5m701 => x77t41kns34hzzhb} | 2 +- executor/Cargo.lock | 62 +++++++++---------- 7 files changed, 65 insertions(+), 65 deletions(-) rename .git-third-party/patches/executor/third-party/wasmtime/{r6518c8dxghpkhsj => fvfcbfxe3ng3djg8} (96%) rename .git-third-party/patches/executor/third-party/wasmtime/{zsjxmza3dms0hr10 => mgz066ws46rvhghv} (99%) rename .git-third-party/patches/executor/third-party/wasmtime/{6xy06vg0d71czwmm => nwdw669v5p3aamta} (99%) rename .git-third-party/patches/executor/third-party/wasmtime/{gbm0xv16dc1fs2km => wyqzzn2hxndgbxbx} (99%) rename .git-third-party/patches/executor/third-party/wasmtime/{4rr93pqjtwm5m701 => x77t41kns34hzzhb} (98%) diff --git a/.git-third-party/manifest.json b/.git-third-party/manifest.json index fee3a719..45c210b8 100644 --- a/.git-third-party/manifest.json +++ b/.git-third-party/manifest.json @@ -2,13 +2,13 @@ "repos": { "executor/third-party/wasmtime": { "url": "https://github.com/bytecodealliance/wasmtime.git", - "commit": "7bac2c2775808aaec5d4aa5627a5e447b51102cf", + "commit": "ebf20ab7cbf35fa3fbd8202562017fda6a541021", "patches": [ - "gbm0xv16dc1fs2km", - "zsjxmza3dms0hr10", - "4rr93pqjtwm5m701", - "r6518c8dxghpkhsj", - "6xy06vg0d71czwmm" + "wyqzzn2hxndgbxbx", + "mgz066ws46rvhghv", + "x77t41kns34hzzhb", + "fvfcbfxe3ng3djg8", + "nwdw669v5p3aamta" ], "submodules": [] }, diff --git a/.git-third-party/patches/executor/third-party/wasmtime/r6518c8dxghpkhsj b/.git-third-party/patches/executor/third-party/wasmtime/fvfcbfxe3ng3djg8 similarity index 96% rename from .git-third-party/patches/executor/third-party/wasmtime/r6518c8dxghpkhsj rename to .git-third-party/patches/executor/third-party/wasmtime/fvfcbfxe3ng3djg8 index 9de42312..646f8811 100644 --- a/.git-third-party/patches/executor/third-party/wasmtime/r6518c8dxghpkhsj +++ b/.git-third-party/patches/executor/third-party/wasmtime/fvfcbfxe3ng3djg8 @@ -45,10 +45,10 @@ index 80dcb86..342489f 100644 #[repr(C)] diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs -index fe1b8d8..7dea98f 100644 +index dbe4e3f..266938b 100644 --- a/crates/cranelift/src/func_environ.rs +++ b/crates/cranelift/src/func_environ.rs -@@ -5218,9 +5218,9 @@ impl FuncEnvironment<'_> { +@@ -5228,9 +5228,9 @@ impl FuncEnvironment<'_> { self.fuel_save_from_var(builder); } @@ -76,10 +76,10 @@ index 1511a65..5669ddb 100644 /// Creates a new cranelift `Signature` with no wasm params/results for the /// given calling convention. diff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rs -index 0a02c4d..772f112 100644 +index 0e12a52..d4c2afd 100644 --- a/crates/cranelift/src/translate/code_translator.rs +++ b/crates/cranelift/src/translate/code_translator.rs -@@ -4764,6 +4764,6 @@ fn float_op_unreachable_check(environ: &mut FuncEnvironment<'_>, builder: &mut F +@@ -4765,6 +4765,6 @@ fn float_op_unreachable_check(environ: &mut FuncEnvironment<'_>, builder: &mut F if environ.are_floats_enabled() { return false; } diff --git a/.git-third-party/patches/executor/third-party/wasmtime/zsjxmza3dms0hr10 b/.git-third-party/patches/executor/third-party/wasmtime/mgz066ws46rvhghv similarity index 99% rename from .git-third-party/patches/executor/third-party/wasmtime/zsjxmza3dms0hr10 rename to .git-third-party/patches/executor/third-party/wasmtime/mgz066ws46rvhghv index b66b8435..ff010451 100644 --- a/.git-third-party/patches/executor/third-party/wasmtime/zsjxmza3dms0hr10 +++ b/.git-third-party/patches/executor/third-party/wasmtime/mgz066ws46rvhghv @@ -17,7 +17,7 @@ store after execution finishes. 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/crates/wasmtime/src/runtime/func.rs b/crates/wasmtime/src/runtime/func.rs -index b0a53c5..c657833 100644 +index ad9f759..94da452 100644 --- a/crates/wasmtime/src/runtime/func.rs +++ b/crates/wasmtime/src/runtime/func.rs @@ -1462,7 +1462,9 @@ use std::collections::BTreeMap; diff --git a/.git-third-party/patches/executor/third-party/wasmtime/6xy06vg0d71czwmm b/.git-third-party/patches/executor/third-party/wasmtime/nwdw669v5p3aamta similarity index 99% rename from .git-third-party/patches/executor/third-party/wasmtime/6xy06vg0d71czwmm rename to .git-third-party/patches/executor/third-party/wasmtime/nwdw669v5p3aamta index 0160cdac..42eddc7d 100644 --- a/.git-third-party/patches/executor/third-party/wasmtime/6xy06vg0d71czwmm +++ b/.git-third-party/patches/executor/third-party/wasmtime/nwdw669v5p3aamta @@ -158,7 +158,7 @@ index afa5ab6..5f3fdee 100644 let mut validator = validator.into_validator(mem::take(&mut compiler.cx.validator_allocations)); diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs -index 7dea98f..ee471b7 100644 +index 266938b..dadf341 100644 --- a/crates/cranelift/src/func_environ.rs +++ b/crates/cranelift/src/func_environ.rs @@ -52,6 +52,14 @@ pub(crate) enum Extension { @@ -197,7 +197,7 @@ index 7dea98f..ee471b7 100644 stack_switching_handler_list_buffer: None, stack_switching_values_buffer: None, -@@ -5144,25 +5149,42 @@ impl FuncEnvironment<'_> { +@@ -5154,25 +5159,42 @@ impl FuncEnvironment<'_> { self.update_state_slot_vmctx(builder); @@ -256,7 +256,7 @@ index 7dea98f..ee471b7 100644 // Additionally we initialize `fuel_var` if it will get used. if self.tunables.consume_fuel { -@@ -5225,22 +5247,44 @@ impl FuncEnvironment<'_> { +@@ -5235,22 +5257,44 @@ impl FuncEnvironment<'_> { } pub fn before_return(&mut self, builder: &mut FunctionBuilder) { @@ -317,7 +317,7 @@ index 7dea98f..ee471b7 100644 pub fn translate_cont_bind( diff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rs -index 772f112..a7bf09c 100644 +index d4c2afd..fdff6a5 100644 --- a/crates/cranelift/src/translate/code_translator.rs +++ b/crates/cranelift/src/translate/code_translator.rs @@ -368,22 +368,17 @@ pub fn translate_operator( @@ -1091,15 +1091,15 @@ index 772f112..a7bf09c 100644 let (a, b) = env.stacks.pop2(); let bitcast_a = optionally_bitcast_vector(a, needed_type, builder); let bitcast_b = optionally_bitcast_vector(b, needed_type, builder); -@@ -4720,6 +4848,7 @@ fn create_catch_block( - let block = builder.create_block(); +@@ -4721,6 +4849,7 @@ fn create_catch_block( let exn_ref = builder.append_block_param(block, exn_payload_ty); builder.switch_to_block(block); + environ.on_catch_block_entry(builder); + environ.restore_semantic_stack_limits_after_exception(builder); debug_assert!(exn_ref_ty.bits() <= exn_payload_ty.bits()); let exn_ref = if exn_ref_ty.bits() < exn_payload_ty.bits() { builder.ins().ireduce(exn_ref_ty, exn_ref) -@@ -4760,7 +4889,10 @@ fn create_catch_block( +@@ -4761,7 +4890,10 @@ fn create_catch_block( Ok(block) } @@ -1281,7 +1281,7 @@ index bd8f42f..b90a75d 100644 memory_init_cow, other.memory_init_cow, diff --git a/crates/wasmtime/src/runtime/func.rs b/crates/wasmtime/src/runtime/func.rs -index c657833..b129bed 100644 +index 94da452..30f7016 100644 --- a/crates/wasmtime/src/runtime/func.rs +++ b/crates/wasmtime/src/runtime/func.rs @@ -1509,7 +1509,10 @@ impl<'a, T: 'static> StoreContextMut<'a, T> { @@ -1342,7 +1342,7 @@ index f7ab83b..cad9d79 100644 continuations: Vec::new(), instances: TryPrimaryMap::new(), diff --git a/crates/wasmtime/src/runtime/vm/vmcontext.rs b/crates/wasmtime/src/runtime/vm/vmcontext.rs -index 4509bc4..a086355 100644 +index 44cee91..781007d 100644 --- a/crates/wasmtime/src/runtime/vm/vmcontext.rs +++ b/crates/wasmtime/src/runtime/vm/vmcontext.rs @@ -721,6 +721,14 @@ const _: () = { diff --git a/.git-third-party/patches/executor/third-party/wasmtime/gbm0xv16dc1fs2km b/.git-third-party/patches/executor/third-party/wasmtime/wyqzzn2hxndgbxbx similarity index 99% rename from .git-third-party/patches/executor/third-party/wasmtime/gbm0xv16dc1fs2km rename to .git-third-party/patches/executor/third-party/wasmtime/wyqzzn2hxndgbxbx index c10b52b9..406e6445 100644 --- a/.git-third-party/patches/executor/third-party/wasmtime/gbm0xv16dc1fs2km +++ b/.git-third-party/patches/executor/third-party/wasmtime/wyqzzn2hxndgbxbx @@ -35,10 +35,10 @@ Subject: [PATCH] feat: rebase genvm 28 files changed, 466 insertions(+), 52 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 83b09c9..4560d95 100644 +index 69b668d..36c85f5 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -375,18 +375,18 @@ wit-bindgen = { version = "0.60.0", default-features = false } +@@ -370,18 +370,18 @@ wit-bindgen = { version = "0.60.0", default-features = false } wit-bindgen-rust-macro = { version = "0.60.0", default-features = false } # wasm-tools family: @@ -181,7 +181,7 @@ index 5f3fdee..afa5ab6 100644 let mut validator = validator.into_validator(mem::take(&mut compiler.cx.validator_allocations)); diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs -index 64e9642..fe1b8d8 100644 +index b72e825..dbe4e3f 100644 --- a/crates/cranelift/src/func_environ.rs +++ b/crates/cranelift/src/func_environ.rs @@ -211,6 +211,9 @@ pub struct FuncEnvironment<'module_environment> { @@ -204,7 +204,7 @@ index 64e9642..fe1b8d8 100644 stack_switching_handler_list_buffer: None, stack_switching_values_buffer: None, -@@ -3444,6 +3450,7 @@ impl FuncEnvironment<'_> { +@@ -3445,6 +3451,7 @@ impl FuncEnvironment<'_> { sig_ref: ir::SigRef, call_args: &[ir::Value], ) -> WasmResult<()> { @@ -212,7 +212,7 @@ index 64e9642..fe1b8d8 100644 Call::new_tail(builder, self, srcloc).direct_call(callee_index, sig_ref, call_args)?; Ok(()) } -@@ -3458,6 +3465,7 @@ impl FuncEnvironment<'_> { +@@ -3459,6 +3466,7 @@ impl FuncEnvironment<'_> { callee: ir::Value, call_args: &[ir::Value], ) -> WasmResult<()> { @@ -220,7 +220,7 @@ index 64e9642..fe1b8d8 100644 Call::new_tail(builder, self, srcloc).indirect_call( table_index, ty_index, -@@ -3476,6 +3484,7 @@ impl FuncEnvironment<'_> { +@@ -3477,6 +3485,7 @@ impl FuncEnvironment<'_> { callee: ir::Value, call_args: &[ir::Value], ) -> WasmResult<()> { @@ -228,7 +228,7 @@ index 64e9642..fe1b8d8 100644 Call::new_tail(builder, self, srcloc).call_ref(sig_ref, callee, call_args)?; Ok(()) } -@@ -5135,6 +5144,26 @@ impl FuncEnvironment<'_> { +@@ -5145,6 +5154,26 @@ impl FuncEnvironment<'_> { self.update_state_slot_vmctx(builder); @@ -255,7 +255,7 @@ index 64e9642..fe1b8d8 100644 // Additionally we initialize `fuel_var` if it will get used. if self.tunables.consume_fuel { self.fuel_function_entry(builder); -@@ -5177,6 +5206,43 @@ impl FuncEnvironment<'_> { +@@ -5187,6 +5216,43 @@ impl FuncEnvironment<'_> { self.isa.triple().architecture == target_lexicon::Architecture::X86_64 } @@ -299,7 +299,7 @@ index 64e9642..fe1b8d8 100644 pub fn translate_cont_bind( &mut self, builder: &mut FunctionBuilder<'_>, -@@ -5334,6 +5400,7 @@ impl FuncEnvironment<'_> { +@@ -5344,6 +5410,7 @@ impl FuncEnvironment<'_> { } pub fn handle_before_return(&mut self, retvals: &[ir::Value], builder: &mut FunctionBuilder) { @@ -321,7 +321,7 @@ index 50c0b26..1511a65 100644 /// Creates a new cranelift `Signature` with no wasm params/results for the /// given calling convention. diff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rs -index 7de3ab3..5c33b47 100644 +index dcb41ff..925a145 100644 --- a/crates/cranelift/src/translate/code_translator.rs +++ b/crates/cranelift/src/translate/code_translator.rs @@ -1071,120 +1071,145 @@ pub fn translate_operator( @@ -830,7 +830,7 @@ index 7de3ab3..5c33b47 100644 } /// Generate a `jump` instruction, but first cast all 128-bit vector values to I8X16 if they -@@ -4669,3 +4758,11 @@ fn create_catch_block( +@@ -4670,3 +4759,11 @@ fn create_catch_block( Ok(block) } @@ -1129,7 +1129,7 @@ index f3f0a3f..698ffc6 100644 fn _assertions_lib() { diff --git a/crates/wasmtime/src/runtime/func.rs b/crates/wasmtime/src/runtime/func.rs -index d847800..b0a53c5 100644 +index b9520fd..ad9f759 100644 --- a/crates/wasmtime/src/runtime/func.rs +++ b/crates/wasmtime/src/runtime/func.rs @@ -1446,6 +1446,32 @@ impl Func { @@ -1312,7 +1312,7 @@ index a081654..9911f9d 100644 impl fmt::Debug for Store { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/crates/wasmtime/src/runtime/vm/vmcontext.rs b/crates/wasmtime/src/runtime/vm/vmcontext.rs -index 9324674..4509bc4 100644 +index 0a9c934..44cee91 100644 --- a/crates/wasmtime/src/runtime/vm/vmcontext.rs +++ b/crates/wasmtime/src/runtime/vm/vmcontext.rs @@ -810,8 +810,10 @@ impl Default for VMStoreContext { diff --git a/.git-third-party/patches/executor/third-party/wasmtime/4rr93pqjtwm5m701 b/.git-third-party/patches/executor/third-party/wasmtime/x77t41kns34hzzhb similarity index 98% rename from .git-third-party/patches/executor/third-party/wasmtime/4rr93pqjtwm5m701 rename to .git-third-party/patches/executor/third-party/wasmtime/x77t41kns34hzzhb index c387d36a..baff824c 100644 --- a/.git-third-party/patches/executor/third-party/wasmtime/4rr93pqjtwm5m701 +++ b/.git-third-party/patches/executor/third-party/wasmtime/x77t41kns34hzzhb @@ -16,7 +16,7 @@ place, so trapping on them broke real numpy code paths. 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rs -index 5c33b47..0a02c4d 100644 +index 925a145..0e12a52 100644 --- a/crates/cranelift/src/translate/code_translator.rs +++ b/crates/cranelift/src/translate/code_translator.rs @@ -1804,7 +1804,8 @@ pub fn translate_operator( diff --git a/executor/Cargo.lock b/executor/Cargo.lock index 9c83dfa8..f2ef4d8f 100644 --- a/executor/Cargo.lock +++ b/executor/Cargo.lock @@ -446,21 +446,21 @@ dependencies = [ [[package]] name = "cranelift-assembler-x64" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-assembler-x64-meta", ] [[package]] name = "cranelift-assembler-x64-meta" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-srcgen", ] [[package]] name = "cranelift-bforest" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-entity", "wasmtime-internal-core", @@ -468,7 +468,7 @@ dependencies = [ [[package]] name = "cranelift-bitset" -version = "0.135.1" +version = "0.135.3" dependencies = [ "serde", "serde_derive", @@ -477,7 +477,7 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.135.1" +version = "0.135.3" dependencies = [ "bumpalo", "cranelift-assembler-x64", @@ -506,7 +506,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-assembler-x64-meta", "cranelift-codegen-shared", @@ -517,18 +517,18 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.135.1" +version = "0.135.3" [[package]] name = "cranelift-control" -version = "0.135.1" +version = "0.135.3" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-bitset", "serde", @@ -538,7 +538,7 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-codegen", "hashbrown 0.17.1", @@ -549,11 +549,11 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.135.1" +version = "0.135.3" [[package]] name = "cranelift-native" -version = "0.135.1" +version = "0.135.3" dependencies = [ "cranelift-codegen", "libc", @@ -562,7 +562,7 @@ dependencies = [ [[package]] name = "cranelift-srcgen" -version = "0.135.1" +version = "0.135.3" [[package]] name = "crc32fast" @@ -1745,7 +1745,7 @@ dependencies = [ [[package]] name = "pulley-interpreter" -version = "48.0.1" +version = "48.0.3" dependencies = [ "cranelift-bitset", "log", @@ -1755,7 +1755,7 @@ dependencies = [ [[package]] name = "pulley-macros" -version = "48.0.1" +version = "48.0.3" dependencies = [ "proc-macro2", "quote", @@ -2690,7 +2690,7 @@ dependencies = [ [[package]] name = "wasmtime" -version = "48.0.1" +version = "48.0.3" dependencies = [ "addr2line 0.26.0", "async-trait", @@ -2730,7 +2730,7 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "48.0.1" +version = "48.0.3" dependencies = [ "anyhow", "cpp_demangle", @@ -2759,7 +2759,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-cache" -version = "48.0.1" +version = "48.0.3" dependencies = [ "base64", "directories-next", @@ -2777,7 +2777,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-component-macro" -version = "48.0.1" +version = "48.0.3" dependencies = [ "anyhow", "proc-macro2", @@ -2790,11 +2790,11 @@ dependencies = [ [[package]] name = "wasmtime-internal-component-util" -version = "48.0.1" +version = "48.0.3" [[package]] name = "wasmtime-internal-core" -version = "48.0.1" +version = "48.0.3" dependencies = [ "anyhow", "hashbrown 0.17.1", @@ -2804,7 +2804,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-cranelift" -version = "48.0.1" +version = "48.0.3" dependencies = [ "cranelift-codegen", "cranelift-control", @@ -2828,7 +2828,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-fiber" -version = "48.0.1" +version = "48.0.3" dependencies = [ "cc", "libc", @@ -2840,7 +2840,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-debug" -version = "48.0.1" +version = "48.0.3" dependencies = [ "cc", "wasmtime-internal-versioned-export-macros", @@ -2848,7 +2848,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-jit-icache-coherence" -version = "48.0.1" +version = "48.0.3" dependencies = [ "libc", "wasmtime-internal-core", @@ -2857,7 +2857,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-unwinder" -version = "48.0.1" +version = "48.0.3" dependencies = [ "cranelift-codegen", "log", @@ -2867,7 +2867,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-versioned-export-macros" -version = "48.0.1" +version = "48.0.3" dependencies = [ "proc-macro2", "quote", @@ -2876,7 +2876,7 @@ dependencies = [ [[package]] name = "wasmtime-internal-wit-bindgen" -version = "48.0.1" +version = "48.0.3" dependencies = [ "anyhow", "bitflags", @@ -2915,7 +2915,7 @@ dependencies = [ [[package]] name = "wiggle" -version = "48.0.1" +version = "48.0.3" dependencies = [ "bitflags", "thiserror 2.0.18", @@ -2927,7 +2927,7 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "48.0.1" +version = "48.0.3" dependencies = [ "heck", "proc-macro2", @@ -2939,7 +2939,7 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "48.0.1" +version = "48.0.3" dependencies = [ "proc-macro2", "quote",