Merge wasmtime-math into wasmtime-core

.github/workflows/main.yml

@@ -1179,6 +1179,8 @@ jobs:
           - crate: "pulley-interpreter --all-features"
           - crate: "wasmtime-internal-error"
           - crate: "wasmtime-internal-error --all-features"
+          - crate: "wasmtime-internal-core"
+          - crate: "wasmtime-internal-core --all-features"
           - script: ./ci/miri-provenance-test.sh
           - script: ./ci/miri-wast.sh ./tests/spec_testsuite/table.wast
     needs: determine

Cargo.toml

@@ -280,7 +280,6 @@ wasmtime-versioned-export-macros = { path = "crates/versioned-export-macros", ve
 wasmtime-slab = { path = "crates/slab", version = "=42.0.0", package = 'wasmtime-internal-slab' }
 wasmtime-jit-icache-coherence = { path = "crates/jit-icache-coherence", version = "=42.0.0", package = 'wasmtime-internal-jit-icache-coherence' }
 wasmtime-wit-bindgen = { path = "crates/wit-bindgen", version = "=42.0.0", package = 'wasmtime-internal-wit-bindgen' }
-wasmtime-math = { path = "crates/math", version = "=42.0.0", package = 'wasmtime-internal-math'  }
 wasmtime-unwinder = { path = "crates/unwinder", version = "=42.0.0", package = 'wasmtime-internal-unwinder' }
 wasmtime-debugger = { path = "crates/debugger", version = "=42.0.0", package = "wasmtime-internal-debugger" }
 wasmtime-wizer = { path = "crates/wizer", version = "42.0.0" }

cranelift/codegen/Cargo.toml

@@ -43,7 +43,7 @@ regalloc2 = { workspace = true, features = ["checker"] }
 souper-ir = { version = "2.1.0", optional = true }
 sha2 = { version = "0.10.2", optional = true }
 rustc-hash = { workspace = true }
-wasmtime-math = { workspace = true }
+wasmtime-core = { workspace = true }
 libm = { workspace = true }
 # It is a goal of the cranelift-codegen crate to have minimal external dependencies.
 # Please don't add any unless they are essential to the task of creating binary

cranelift/codegen/src/isa/riscv64/lower/isle.rs

@@ -24,7 +24,7 @@ use crate::{
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use regalloc2::PReg;
-use wasmtime_math::{f32_cvt_to_int_bounds, f64_cvt_to_int_bounds};
+use wasmtime_core::math::{f32_cvt_to_int_bounds, f64_cvt_to_int_bounds};
 
 type BoxCallInfo = Box<CallInfo<ExternalName>>;
 type BoxCallIndInfo = Box<CallInfo<Reg>>;

crates/core/Cargo.toml

@@ -11,8 +11,10 @@ version.workspace = true
 # This crate should have *very* minimal dependencies! Don't add new ones
 # lightly.
 wasmtime-error = { workspace = true }
+libm = { workspace = true }
 
 [lints]
 workspace = true
 
 [features]
+std = []

crates/core/src/alloc/arc.rs

@@ -26,3 +26,13 @@ impl<T> TryNew for Arc<T> {
         return Ok(Arc::new(value));
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::{Arc, TryNew};
+
+    #[test]
+    fn try_new() {
+        <Arc<_> as TryNew>::try_new(4).unwrap();
+    }
+}

crates/core/src/alloc/boxed.rs

@@ -193,6 +193,11 @@ mod tests {
         }
     }
 
+    #[test]
+    fn try_new() {
+        <Box<_> as TryNew>::try_new(4).unwrap();
+    }
+
     #[test]
     fn new_boxed_slice_from_iter_smoke_test() {
         let slice = new_boxed_slice_from_iter(3, [42, 36, 1337]).unwrap();

crates/core/src/lib.rs

@@ -12,4 +12,8 @@
 
 extern crate alloc as std_alloc;
 
+#[cfg(feature = "std")]
+extern crate std;
+
 pub mod alloc;
+pub mod math;

crates/math/src/lib.rs → crates/core/src/math.rs

@@ -1,4 +1,4 @@
-//! A minimal helper crate for implementing float-related operations for
+//! A minimal module for implementing float-related operations for
 //! WebAssembly in terms of the native platform primitives.
 //!
 //! > **⚠️ Warning ⚠️**: this crate is an internal-only crate for the Wasmtime
@@ -23,10 +23,7 @@
 //! needed so they're implemented only in a single location here rather than
 //! multiple.
 
-#![no_std]
-
-#[cfg(feature = "std")]
-extern crate std;
+#![allow(missing_docs, reason = "self-describing methods")]
 
 /// Returns the bounds for guarding a trapping f32-to-int conversion.
 ///

crates/cranelift/Cargo.toml

@@ -32,7 +32,7 @@ cfg-if = { workspace = true }
 wasmtime-versioned-export-macros = { workspace = true }
 itertools = { workspace = true }
 pulley-interpreter = { workspace = true, optional = true }
-wasmtime-math = { workspace = true }
+wasmtime-core = { workspace = true }
 wasmtime-unwinder = { workspace = true, features = ["cranelift"] }
 
 [features]

crates/cranelift/src/func_environ.rs

@@ -22,6 +22,7 @@ use cranelift_frontend::{FuncInstBuilder, FunctionBuilder};
 use smallvec::{SmallVec, smallvec};
 use std::mem;
 use wasmparser::{FuncValidator, Operator, WasmFeatures, WasmModuleResources};
+use wasmtime_core::math::f64_cvt_to_int_bounds;
 use wasmtime_environ::{
     BuiltinFunctionIndex, DataIndex, DefinedFuncIndex, ElemIndex, EngineOrModuleTypeIndex,
     FrameStateSlotBuilder, FrameValType, FuncIndex, FuncKey, GlobalIndex, IndexType, Memory,
@@ -31,7 +32,6 @@ use wasmtime_environ::{
     WasmValType,
 };
 use wasmtime_environ::{FUNCREF_INIT_BIT, FUNCREF_MASK};
-use wasmtime_math::f64_cvt_to_int_bounds;
 
 #[derive(Debug)]
 pub(crate) enum Extension {

crates/wasmtime/Cargo.toml

@@ -30,7 +30,7 @@ wasmtime-component-util = { workspace = true, optional = true }
 wasmtime-slab = { workspace = true, optional = true }
 wasmtime-versioned-export-macros = { workspace = true }
 wasmtime-wmemcheck = { workspace = true, optional = true }
-wasmtime-math = { workspace = true }
+wasmtime-core = { workspace = true }
 pulley-interpreter = { workspace = true }
 target-lexicon = { workspace = true }
 wasmparser = { workspace = true }
@@ -347,7 +347,7 @@ std = [
   'once_cell',
   'wasmtime-fiber?/std',
   'pulley-interpreter/std',
-  'wasmtime-math/std',
+  'wasmtime-core/std',
   'addr2line?/std',
   "dep:rustix",
   "wasmtime-jit-icache-coherence",

crates/wasmtime/src/runtime/vm/libcalls.rs

@@ -69,6 +69,7 @@ use core::convert::Infallible;
 use core::ptr::NonNull;
 #[cfg(feature = "threads")]
 use core::time::Duration;
+use wasmtime_core::math::WasmFloat;
 use wasmtime_environ::{
     DataIndex, DefinedMemoryIndex, DefinedTableIndex, ElemIndex, FuncIndex, MemoryIndex,
     TableIndex, Trap,
@@ -1451,35 +1452,35 @@ fn update_mem_size(store: &mut dyn VMStore, instance: InstanceId, num_pages: u32
 }
 
 fn floor_f32(_store: &mut dyn VMStore, _instance: InstanceId, val: f32) -> f32 {
-    wasmtime_math::WasmFloat::wasm_floor(val)
+    val.wasm_floor()
 }
 
 fn floor_f64(_store: &mut dyn VMStore, _instance: InstanceId, val: f64) -> f64 {
-    wasmtime_math::WasmFloat::wasm_floor(val)
+    val.wasm_floor()
 }
 
 fn ceil_f32(_store: &mut dyn VMStore, _instance: InstanceId, val: f32) -> f32 {
-    wasmtime_math::WasmFloat::wasm_ceil(val)
+    val.wasm_ceil()
 }
 
 fn ceil_f64(_store: &mut dyn VMStore, _instance: InstanceId, val: f64) -> f64 {
-    wasmtime_math::WasmFloat::wasm_ceil(val)
+    val.wasm_ceil()
 }
 
 fn trunc_f32(_store: &mut dyn VMStore, _instance: InstanceId, val: f32) -> f32 {
-    wasmtime_math::WasmFloat::wasm_trunc(val)
+    val.wasm_trunc()
 }
 
 fn trunc_f64(_store: &mut dyn VMStore, _instance: InstanceId, val: f64) -> f64 {
-    wasmtime_math::WasmFloat::wasm_trunc(val)
+    val.wasm_trunc()
 }
 
 fn nearest_f32(_store: &mut dyn VMStore, _instance: InstanceId, val: f32) -> f32 {
-    wasmtime_math::WasmFloat::wasm_nearest(val)
+    val.wasm_nearest()
 }
 
 fn nearest_f64(_store: &mut dyn VMStore, _instance: InstanceId, val: f64) -> f64 {
-    wasmtime_math::WasmFloat::wasm_nearest(val)
+    val.wasm_nearest()
 }
 
 // This intrinsic is only used on x86_64 platforms as an implementation of
@@ -1617,10 +1618,10 @@ fn fma_f32x4(
 
         U {
             mem: [
-                wasmtime_math::WasmFloat::wasm_mul_add(x[0], y[0], z[0]),
-                wasmtime_math::WasmFloat::wasm_mul_add(x[1], y[1], z[1]),
-                wasmtime_math::WasmFloat::wasm_mul_add(x[2], y[2], z[2]),
-                wasmtime_math::WasmFloat::wasm_mul_add(x[3], y[3], z[3]),
+                x[0].wasm_mul_add(y[0], z[0]),
+                x[1].wasm_mul_add(y[1], z[1]),
+                x[2].wasm_mul_add(y[2], z[2]),
+                x[3].wasm_mul_add(y[3], z[3]),
             ],
         }
         .reg
@@ -1645,10 +1646,7 @@ fn fma_f64x2(
         let z = U { reg: z }.mem;
 
         U {
-            mem: [
-                wasmtime_math::WasmFloat::wasm_mul_add(x[0], y[0], z[0]),
-                wasmtime_math::WasmFloat::wasm_mul_add(x[1], y[1], z[1]),
-            ],
+            mem: [x[0].wasm_mul_add(y[0], z[0]), x[1].wasm_mul_add(y[1], z[1])],
         }
         .reg
     }

pulley/Cargo.toml

@@ -16,7 +16,7 @@ workspace = true
 arbitrary = { workspace = true, optional = true }
 cranelift-bitset = { workspace = true }
 log = { workspace = true }
-wasmtime-math = { workspace = true, optional = true }
+wasmtime-core = { workspace = true, optional = true }
 anyhow = { workspace = true, optional = true }
 pulley-macros = { workspace = true }
 
@@ -27,12 +27,12 @@ clap = { workspace = true }
 termcolor = { workspace = true }
 
 [features]
-std = ['wasmtime-math?/std']
+std = ['wasmtime-core?/std']
 arbitrary = ["dep:arbitrary", "arbitrary/derive", "std", "cranelift-bitset/arbitrary"]
 encode = []
 decode = []
 disas = ["decode"]
-interp = ["decode", "encode", "dep:wasmtime-math"]
+interp = ["decode", "encode", "dep:wasmtime-core"]
 profile = ['std', 'dep:anyhow']
 
 [package.metadata.docs.rs]

pulley/src/interp.rs

@@ -13,7 +13,7 @@ use core::ops::ControlFlow;
 use core::ops::{Index, IndexMut};
 use core::ptr::NonNull;
 use pulley_macros::interp_disable_if_cfg;
-use wasmtime_math::{WasmFloat, f32_cvt_to_int_bounds, f64_cvt_to_int_bounds};
+use wasmtime_core::math::{WasmFloat, f32_cvt_to_int_bounds, f64_cvt_to_int_bounds};
 
 mod debug;
 #[cfg(all(not(pulley_tail_calls), not(pulley_assume_llvm_makes_tail_calls)))]

scripts/publish.rs

@@ -21,7 +21,6 @@ const CRATES_TO_PUBLISH: &[&str] = &[
     "wasmtime-internal-error",
     "wasmtime-internal-core",
     "cranelift-bitset",
-    "wasmtime-internal-math",
     "pulley-macros",
     "pulley-interpreter",
     // cranelift

supply-chain/audits.toml

@@ -1006,6 +1006,14 @@ start = "2026-01-07"
 end = "2027-01-08"
 notes = "The Bytecode Alliance is the author of this crate"
 
+[[wildcard-audits.wasmtime-internal-core]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+trusted-publisher = "github:bytecodealliance/wasmtime"
+start = "2026-01-07"
+end = "2027-01-08"
+notes = "The Bytecode Alliance is the author of this crate"
+
 [[wildcard-audits.wasmtime-internal-cranelift]]
 who = "Alex Crichton <alex@alexcrichton.com>"
 criteria = "safe-to-deploy"
@@ -5774,6 +5782,12 @@ criteria = "safe-to-deploy"
 delta = "0.243.0 -> 0.244.0"
 notes = "The Bytecode Alliance is the author of this crate"
 
+[[audits.wasmtime-internal-core]]
+who = "Alex Crichton <alex@alexcrichton.com>"
+criteria = "safe-to-deploy"
+version = "0.0.0"
+notes = "Empty crate"
+
 [[audits.wasmtime-wasi-tls-openssl]]
 who = "Dave Bakker <github@davebakker.io>"
 criteria = "safe-to-deploy"