From 70e83221bad372950bba6d3b901761f41ce2ad73 Mon Sep 17 00:00:00 2001
From: Chris Fallin <chris@cfallin.org>
Date: Tue, 15 Apr 2025 13:23:00 -0700
Subject: [PATCH 1/2] Cranelift: update to regalloc2 0.12.1.

Pulls in bytecodealliance/regalloc2#224 which fixes the regalloc checker
for try-call instructions.

This PR also includes the test from #10585. Fixes #10585.
---
 Cargo.lock                                         |  4 ++--
 Cargo.toml                                         |  2 +-
 .../isa/x64/exceptions-regalloc-verifier.clif      | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 cranelift/filetests/filetests/isa/x64/exceptions-regalloc-verifier.clif

diff --git a/Cargo.lock b/Cargo.lock
index d943a59bb0c2..b5b6875b3936 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2794,9 +2794,9 @@ dependencies = [
 
 [[package]]
 name = "regalloc2"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f8901022fb3dd7d9fc8e925df91df33e889705a1e3c76901fe5abef917788dc"
+checksum = "987b16639ffa003f99fe9c183ce633c6ba2578f6383b2f04fe9dc669f9aac55a"
 dependencies = [
  "allocator-api2",
  "bumpalo",
diff --git a/Cargo.toml b/Cargo.toml
index 9a0a07d46dd2..5a050f46243c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -287,7 +287,7 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra
 
 # Bytecode Alliance maintained dependencies:
 # ---------------------------
-regalloc2 = "0.12.0"
+regalloc2 = "0.12.1"
 
 # cap-std family:
 target-lexicon = "0.13.0"
diff --git a/cranelift/filetests/filetests/isa/x64/exceptions-regalloc-verifier.clif b/cranelift/filetests/filetests/isa/x64/exceptions-regalloc-verifier.clif
new file mode 100644
index 000000000000..9967459e4d62
--- /dev/null
+++ b/cranelift/filetests/filetests/isa/x64/exceptions-regalloc-verifier.clif
@@ -0,0 +1,14 @@
+test compile
+set regalloc_checker=1
+target x86_64
+
+function u0:0() -> i32 tail {
+    sig0 = () -> i32 tail
+    fn0 = u0:1 sig0
+
+block0:
+    try_call fn0(), sig0, block1(ret0), []
+
+block1(v0: i32):
+    return v0
+}

From caa7056c2853e9599d738a280556b1c776929522 Mon Sep 17 00:00:00 2001
From: Chris Fallin <chris@cfallin.org>
Date: Tue, 15 Apr 2025 13:38:39 -0700
Subject: [PATCH 2/2] cargo vet

---
 supply-chain/imports.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 25e6e3630ed4..a3ed23651120 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -933,8 +933,8 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.regalloc2]]
-version = "0.12.0"
-when = "2025-04-11"
+version = "0.12.1"
+when = "2025-04-15"
 user-id = 3726
 user-login = "cfallin"
 user-name = "Chris Fallin"