Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Fix a couple of issues that prevent wasmtime for compiling/running on arm64_32 (Apple Watch) (#13259)

Matt Hargettc634c9b535e8
diff --git a/Cargo.lock b/Cargo.lock
index e223008489..1179e47649 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2395,13 +2395,19 @@ dependencies = [
[[package]]
name = "mach2"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
dependencies = [
"libc",
]
+[[package]]
+name = "mach2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
+
[[package]]
name = "macro-string"
version = "0.2.0"
@@ -3213,7 +3219,7 @@ checksum = "e6b6ebd13bc009aef9cd476c1310d49ac354d36e240cf1bd753290f3dc7199a7"
dependencies = [
"bitflags 1.3.2",
"libc",
- "mach2",
+ "mach2 0.4.3",
"windows-sys 0.52.0",
]
@@ -4727,7 +4733,7 @@ dependencies = [
"libc",
"libtest-mimic",
"log",
- "mach2",
+ "mach2 0.6.0",
"memfd",
"object 0.39.0",
"once_cell",
diff --git a/Cargo.toml b/Cargo.toml
index 301c69cc55..f0b6d68720 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -394,7 +394,7 @@ async-trait = "0.1.89"
heck = "0.5"
similar = "2.7.0"
toml = "0.9.8"
-mach2 = "0.4.2"
+mach2 = "0.6"
memfd = "0.6.5"
psm = "0.1.11"
proptest = "1.11.0"
diff --git a/crates/unwinder/src/arch/aarch64.rs b/crates/unwinder/src/arch/aarch64.rs
index bc639267a8..a79ccfba97 100644
--- a/crates/unwinder/src/arch/aarch64.rs
+++ b/crates/unwinder/src/arch/aarch64.rs
@@ -1,8 +1,53 @@
//! Arm64-specific definitions of architecture-specific functions in Wasmtime.
+//!
+//! ## ILP32 vs LP64 on aarch64
+//!
+//! Aarch64 GPRs are 64 bits regardless of pointer width. On the usual
+//! `aarch64-*` (LP64) targets `usize` is `u64` and the two are
+//! interchangeable, but on `arm64_32-apple-watchos` (ILP32 ABI: 64-bit
+//! registers, 32-bit pointers) `usize` is `u32`. An inline-asm operand
+//! typed as `usize` is therefore ambiguous on `arm64_32` between the
+//! `w<N>` (32-bit lane) and `x<N>` (64-bit GPR) views — exactly what
+//! rustc's `asm_sub_register` lint flags. The Rust Reference is also
+//! explicit that the upper bits of a register holding a sub-register-
+//! width input are *undefined*[0]; relying on the ISA-side zero-extend
+//! that aarch64 happens to perform on `mov w<N>, ...` would be relying
+//! on a property the language doesn't promise.
+//!
+//! The public functions in this module keep their `usize` signatures —
+//! that's the convention shared with the other unwinder backends
+//! (`x86.rs`, `riscv64.rs`, `s390x.rs`), and the `u64`-vs-pointer-width
+//! split is unique to aarch64-on-ILP32. Inside this module, any
+//! register-bearing local that participates in inline asm is typed
+//! `u64` so the operand class is unambiguously the 64-bit GPR view.
+//! The cross-boundary casts are explicit:
+//!
+//! - `u64::try_from(v).unwrap()` widens `usize` → `u64`. Infallible
+//! on every supported Rust target (`usize` is at most 64 bits
+//! everywhere today), and the `.unwrap()` documents that any
+//! failure would be a target-property issue rather than a runtime
+//! one.
+//! - `as usize` narrows `u64` → `usize` at the return. Truncates on
+//! `arm64_32` by design — the saved PC/SP there is a 32-bit host
+//! pointer that fits exactly in the low 32 bits of the register —
+//! and is the identity on aarch64 LP64 targets.
+//!
+//! ## AAPCS64 frame-record stride
+//!
+//! Reads of the AAPCS64 frame record (saved FP / saved LR) use
+//! `*mut u64` rather than `*mut usize`. AAPCS64 reserves two 64-bit
+//! slots for the frame record on every aarch64 ABI variant — including
+//! `arm64_32` — so `.offset(1)` advancing by 8 bytes is correct
+//! regardless of pointer width. With `*mut usize` on `arm64_32`
+//! `.offset(1)` would advance by only 4 bytes and read the upper half
+//! of the saved-FP slot. This matters for a future `arm64_32` Cranelift
+//! port; today the `arm64_32-apple-watchos` toolchain only runs Pulley.
+//!
+//! [0]: https://doc.rust-lang.org/reference/inline-assembly.html#r-asm.register-operands.smaller-value
#[inline]
pub fn get_stack_pointer() -> usize {
- let stack_pointer: usize;
+ let stack_pointer: u64;
unsafe {
core::arch::asm!(
"mov {}, sp",
@@ -10,7 +55,9 @@ pub fn get_stack_pointer() -> usize {
options(nostack,nomem),
);
}
- stack_pointer
+ // Truncates u64 → u32 on arm64_32 (the host SP is a 32-bit pointer
+ // that fits in the low 32 bits); identity on aarch64 LP64.
+ stack_pointer as usize
}
// The aarch64 calling conventions save the return PC one i64 above the FP and
@@ -26,7 +73,9 @@ pub fn get_stack_pointer() -> usize {
// - AAPCS64 section 6.2.3 The Frame Pointer[0]
pub unsafe fn get_next_older_pc_from_fp(fp: usize) -> usize {
unsafe {
- let mut pc = *(fp as *mut usize).offset(1);
+ // `*mut u64` (not `*mut usize`) so `.offset(1)` advances by 8 bytes
+ // on every aarch64 ABI variant — see module docs.
+ let mut pc: u64 = *(fp as *mut u64).offset(1);
// The return address might be signed, so we need to strip the highest bits
// (where the authentication code might be located) in order to obtain a
@@ -35,6 +84,9 @@ pub unsafe fn get_next_older_pc_from_fp(fp: usize) -> usize {
// the implementation is backward-compatible and there is no duplication.
// However, this instruction requires the LR register for both its input and
// output.
+ //
+ // `pc` is `u64` so the operand class is unambiguously `x<N>` (the 64-bit
+ // GPR view); see module docs for why.
core::arch::asm!(
"mov lr, {pc}",
"xpaclri",
@@ -44,7 +96,11 @@ pub unsafe fn get_next_older_pc_from_fp(fp: usize) -> usize {
options(nomem, nostack, preserves_flags, pure),
);
- pc
+ // Truncates u64 → u32 on arm64_32 (the saved PC there is a 32-bit
+ // host pointer; XPACLRI strips any PAC bits on v8.3+, no-op on
+ // earlier cores like the A12 in Apple Watch SE2's S8 SoC);
+ // identity on aarch64 LP64.
+ pc as usize
}
}
@@ -55,6 +111,15 @@ pub unsafe fn resume_to_exception_handler(
payload1: usize,
payload2: usize,
) -> ! {
+ // The asm operands name registers explicitly (`in("x0")` etc.), so the
+ // `asm_sub_register` lint doesn't fire here even with `usize` operands.
+ // Widen anyway for consistency with the rest of this module's "register-
+ // bearing locals are `u64`" rule — see module docs.
+ let pc = u64::try_from(pc).unwrap();
+ let sp = u64::try_from(sp).unwrap();
+ let fp = u64::try_from(fp).unwrap();
+ let payload1 = u64::try_from(payload1).unwrap();
+ let payload2 = u64::try_from(payload2).unwrap();
unsafe {
core::arch::asm!(
"mov sp, x2",
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index 04085992fe..1cc3ac5fb8 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -7095,6 +7095,18 @@ user-id = 2915 # Amanieu d'Antras (Amanieu)
start = "2019-05-04"
end = "2024-07-06"
+[[trusted.mach2]]
+criteria = "safe-to-deploy"
+user-id = 51017 # Yuki Okushi (JohnTitor)
+start = "2021-11-15"
+end = "2027-05-04"
+
+[[trusted.mach2]]
+criteria = "safe-to-deploy"
+trusted-publisher = "github:JohnTitor/mach2"
+start = "2025-11-16"
+end = "2027-05-04"
+
[[trusted.macro-string]]
criteria = "safe-to-deploy"
user-id = 3618 # David Tolnay (dtolnay)
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index c455fddfbf..92fc991656 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -1031,6 +1031,18 @@ user-id = 6825
user-login = "sunfishcode"
user-name = "Dan Gohman"
+[[publisher.mach2]]
+version = "0.4.3"
+when = "2025-06-22"
+user-id = 51017
+user-login = "JohnTitor"
+user-name = "Yuki Okushi"
+
+[[publisher.mach2]]
+version = "0.6.0"
+when = "2025-11-16"
+trusted-publisher = "github:JohnTitor/mach2"
+
[[publisher.macro-string]]
version = "0.2.0"
when = "2026-02-24"
@@ -3186,12 +3198,6 @@ delta = "0.4.18 -> 0.4.20"
notes = "Only cfg attribute and internal macro changes and module refactorings"
aggregated-from = "https://raw.githubusercontent.com/mozilla/glean/main/supply-chain/audits.toml"
-[[audits.mozilla.audits.mach2]]
-who = "Gabriele Svelto <[email protected]>"
-criteria = "safe-to-deploy"
-version = "0.4.1"
-aggregated-from = "https://hg.mozilla.org/mozilla-central/raw-file/tip/supply-chain/audits.toml"
-
[[audits.mozilla.audits.num-conv]]
who = "Alex Franchuk <[email protected]>"
criteria = "safe-to-deploy"