Update to Wasmtime 42

Cargo.toml

@@ -24,9 +24,9 @@ license = "Apache-2.0 WITH LLVM-exception"
 [workspace.dependencies]
 brotli = "8.0.2"
 clap = { version = "4.5.60", features = ["derive"] }
-wasmtime = "41"
-wasmtime-wasi = "41"
-wasmtime-wizer = "41"
+wasmtime = "42"
+wasmtime-wasi = "42"
+wasmtime-wizer = "42"
 wasm-opt = "0.116.1"
 anyhow = "1.0"
 javy = { path = "crates/javy", version = "7.0.0-alpha.1" }

crates/codegen/src/lib.rs

@@ -91,7 +91,7 @@ use walrus::{
     DataId, DataKind, ExportItem, FunctionBuilder, FunctionId, LocalId, MemoryId, Module, ValType,
 };
 use wasm_opt::{OptimizationOptions, ShrinkLevel};
-use wasmtime::{Config, Engine, Linker, Store};
+use wasmtime::{Engine, Linker, Store};
 use wasmtime_wasi::{WasiCtxBuilder, p2::pipe::MemoryInputPipe};
 
 use anyhow::Result;
@@ -223,9 +223,7 @@ impl Generator {
         let config = transform::module_config();
         let module = match &self.linking {
             LinkingKind::Static => {
-                let mut cfg = Config::new();
-                cfg.async_support(true);
-                let engine = Engine::new(&cfg)?;
+                let engine = Engine::default();
                 let wasi = WasiCtxBuilder::new()
                     .stdin(MemoryInputPipe::new(self.js_runtime_config.clone()))
                     .inherit_stdout()

crates/plugin-processing/src/lib.rs

@@ -2,7 +2,7 @@ use anyhow::{Result, bail};
 use std::{borrow::Cow, fs};
 use walrus::{FunctionId, ImportKind, ValType};
 use wasmparser::{Parser, Payload};
-use wasmtime::{Config, Engine, Linker, Store};
+use wasmtime::{Engine, Linker, Store};
 use wasmtime_wasi::WasiCtxBuilder;
 use wasmtime_wizer::Wizer;
 
@@ -126,13 +126,11 @@ fn optimize_module(wasm_bytes: &[u8]) -> Result<Vec<u8>> {
 }
 
 async fn preinitialize_module(wasm_bytes: &[u8]) -> Result<Vec<u8>> {
-    let mut cfg = Config::new();
-    cfg.async_support(true);
-    let engine = Engine::new(&cfg)?;
+    let engine = Engine::default();
     let wasi = WasiCtxBuilder::new().inherit_stderr().build_p1();
     let mut store = Store::new(&engine, wasi);
 
-    Wizer::new()
+    Ok(Wizer::new()
         .init_func("initialize-runtime")
         .keep_init_func(true)
         .run(&mut store, wasm_bytes, async |store, module| {
@@ -143,5 +141,5 @@ async fn preinitialize_module(wasm_bytes: &[u8]) -> Result<Vec<u8>> {
             let instance = linker.instantiate_async(store, module).await?;
             Ok(instance)
         })
-        .await
+        .await?)
 }

crates/runner/src/lib.rs

@@ -235,7 +235,7 @@ pub struct Runner {
 pub struct RunnerError {
     pub stdout: Vec<u8>,
     pub stderr: String,
-    pub err: anyhow::Error,
+    pub err: wasmtime::Error,
 }
 
 impl Error for RunnerError {}
@@ -652,15 +652,15 @@ impl Runner {
             .get_typed_func::<(u32, u32, u32, u32), u32>(store.as_context_mut(), "cabi_realloc")?;
         let orig_ptr = 0;
         let orig_size = 0;
-        realloc_func.call(
+        Ok(realloc_func.call(
             store.as_context_mut(),
             (orig_ptr, orig_size, alignment, new_size),
-        )
+        )?)
     }
 
     fn extract_store_data(
         &self,
-        call_result: Result<()>,
+        call_result: wasmtime::Result<()>,
         mut store: Store<StoreContext>,
     ) -> Result<(Vec<u8>, Vec<u8>, u64)> {
         let fuel_consumed = self.initial_fuel - store.as_context_mut().get_fuel()?;

supply-chain/audits.toml

@@ -246,6 +246,12 @@ user-id = 6825 # Dan Gohman (sunfishcode)
 start = "2020-09-15"
 end = "2027-01-06"
 
+[[trusted.gimli]]
+criteria = "safe-to-deploy"
+user-id = 4415 # Philip Craig (philipc)
+start = "2019-04-25"
+end = "2027-03-02"
+
 [[trusted.glob]]
 criteria = "safe-to-deploy"
 user-id = 55123 # rust-lang-owner
@@ -360,6 +366,12 @@ user-id = 696 # Nick Fitzgerald (fitzgen)
 start = "2020-01-14"
 end = "2027-03-02"
 
+[[trusted.libm]]
+criteria = "safe-to-deploy"
+user-id = 55123 # rust-lang-owner
+start = "2024-10-26"
+end = "2027-03-02"
+
 [[trusted.link-cplusplus]]
 criteria = "safe-to-deploy"
 user-id = 3618 # David Tolnay (dtolnay)

supply-chain/config.toml

@@ -138,55 +138,55 @@ version = "0.2.17"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-assembler-x64]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-assembler-x64-meta]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-bforest]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-bitset]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-codegen]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-codegen-meta]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-codegen-shared]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-control]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-entity]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-frontend]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-isle]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-native]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.cranelift-srcgen]]
-version = "0.128.3"
+version = "0.129.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.crc32fast]]
@@ -301,10 +301,6 @@ criteria = "safe-to-deploy"
 version = "0.4.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.gimli]]
-version = "0.26.2"
-criteria = "safe-to-deploy"
-
 [[exemptions.halfbrown]]
 version = "0.4.0"
 criteria = "safe-to-deploy"
@@ -365,10 +361,6 @@ criteria = "safe-to-deploy"
 version = "0.8.9"
 criteria = "safe-to-deploy"
 
-[[exemptions.libm]]
-version = "0.2.15"
-criteria = "safe-to-deploy"
-
 [[exemptions.libredox]]
 version = "0.1.10"
 criteria = "safe-to-deploy"
@@ -450,11 +442,11 @@ version = "3.4.0"
 criteria = "safe-to-deploy"
 
 [[exemptions.pulley-interpreter]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.pulley-macros]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.r-efi]]
@@ -690,87 +682,83 @@ version = "0.116.0"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-environ]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-cache]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-component-macro]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-component-util]]
-version = "41.0.3"
+version = "42.0.1"
+criteria = "safe-to-deploy"
+
+[[exemptions.wasmtime-internal-core]]
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-cranelift]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-fiber]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-jit-debug]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-jit-icache-coherence]]
-version = "41.0.3"
-criteria = "safe-to-deploy"
-
-[[exemptions.wasmtime-internal-math]]
-version = "41.0.3"
-criteria = "safe-to-deploy"
-
-[[exemptions.wasmtime-internal-slab]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-unwinder]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-versioned-export-macros]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-winch]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-internal-wit-bindgen]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-wasi]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-wasi-io]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wasmtime-wizer]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wiggle]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wiggle-generate]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.wiggle-macro]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.winapi]]
@@ -786,7 +774,7 @@ version = "0.4.0"
 criteria = "safe-to-deploy"
 
 [[exemptions.winch-codegen]]
-version = "41.0.3"
+version = "42.0.1"
 criteria = "safe-to-deploy"
 
 [[exemptions.windows-core]]