From c8c87421a5ef753edc27066a571fd0afcc066a6d Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Tue, 15 Apr 2025 14:42:32 +0000
Subject: [PATCH] Nicer formatting for verifier errors during define_function

---
 src/base.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/base.rs b/src/base.rs
index 9d425a3b292a..6b850a9a6e69 100644
--- a/src/base.rs
+++ b/src/base.rs
@@ -228,6 +228,18 @@ pub(crate) fn compile_fn(
                     name = codegened_func.symbol_name
                 ));
             }
+            Err(ModuleError::Compilation(CodegenError::Verifier(err))) => {
+                let early_dcx = rustc_session::EarlyDiagCtxt::new(
+                    rustc_session::config::ErrorOutputType::default(),
+                );
+                let _ = early_dcx.early_err(format!("{:?}", err));
+                let pretty_error = cranelift_codegen::print_errors::pretty_verifier_error(
+                    &context.func,
+                    Some(Box::new(&clif_comments)),
+                    err,
+                );
+                early_dcx.early_fatal(format!("cranelift verify error:\n{}", pretty_error));
+            }
             Err(err) => {
                 panic!("Error while defining {name}: {err:?}", name = codegened_func.symbol_name);
             }