Improve error messages received from Cranelift

crates/api/src/trampoline/func.rs

@@ -7,6 +7,7 @@ use alloc::{boxed::Box, rc::Rc, string::ToString, vec::Vec};
 use anyhow::Result;
 use core::cmp;
 use cranelift_codegen::ir::{types, InstBuilder, StackSlotData, StackSlotKind, TrapCode};
+use cranelift_codegen::print_errors::pretty_error;
 use cranelift_codegen::{binemit, ir, isa, Context};
 use cranelift_entity::{EntityRef, PrimaryMap};
 use cranelift_frontend::{FunctionBuilder, FunctionBuilderContext};
@@ -174,6 +175,7 @@ fn make_trampoline(
             &mut trap_sink,
             &mut stackmap_sink,
         )
+        .map_err(|error| pretty_error(&context.func, Some(isa), error))
         .expect("compile_and_emit");
 
     let mut unwind_info = Vec::new();

crates/environ/src/compilation.rs

@@ -5,7 +5,7 @@ use crate::address_map::{ModuleAddressMap, ValueLabelsRanges};
 use crate::module;
 use crate::module_environ::FunctionBodyData;
 use alloc::vec::Vec;
-use cranelift_codegen::{binemit, ir, isa, CodegenError};
+use cranelift_codegen::{binemit, ir, isa};
 use cranelift_entity::PrimaryMap;
 use cranelift_wasm::{DefinedFuncIndex, FuncIndex, ModuleTranslationState, WasmError};
 use serde::{Deserialize, Serialize};
@@ -156,8 +156,8 @@ pub enum CompileError {
     Wasm(#[from] WasmError),
 
     /// A compilation error occured.
-    #[error("Compilation error")]
-    Codegen(#[from] CodegenError),
+    #[error("Compilation error: {0}")]
+    Codegen(String),
 
     /// A compilation error occured.
     #[error("Debug info is not supported with this configuration")]

crates/environ/src/cranelift.rs

@@ -19,6 +19,7 @@ use cranelift_codegen::binemit;
 use cranelift_codegen::ir;
 use cranelift_codegen::ir::ExternalName;
 use cranelift_codegen::isa;
+use cranelift_codegen::print_errors::pretty_error;
 use cranelift_codegen::Context;
 use cranelift_entity::PrimaryMap;
 use cranelift_wasm::{DefinedFuncIndex, FuncIndex, FuncTranslator, ModuleTranslationState};
@@ -239,13 +240,21 @@ impl crate::compilation::Compiler for Cranelift {
                             let mut reloc_sink = RelocSink::new(func_index);
                             let mut trap_sink = TrapSink::new();
                             let mut stackmap_sink = binemit::NullStackmapSink {};
-                            context.compile_and_emit(
-                                isa,
-                                &mut code_buf,
-                                &mut reloc_sink,
-                                &mut trap_sink,
-                                &mut stackmap_sink,
-                            )?;
+                            context
+                                .compile_and_emit(
+                                    isa,
+                                    &mut code_buf,
+                                    &mut reloc_sink,
+                                    &mut trap_sink,
+                                    &mut stackmap_sink,
+                                )
+                                .map_err(|error| {
+                                    CompileError::Codegen(pretty_error(
+                                        &context.func,
+                                        Some(isa),
+                                        error,
+                                    ))
+                                })?;
 
                             context.emit_unwind_info(isa, &mut unwind_info);
 
@@ -257,7 +266,15 @@ impl crate::compilation::Compiler for Cranelift {
                             };
 
                             let ranges = if generate_debug_info {
-                                Some(context.build_value_labels_ranges(isa)?)
+                                let ranges =
+                                    context.build_value_labels_ranges(isa).map_err(|error| {
+                                        CompileError::Codegen(pretty_error(
+                                            &context.func,
+                                            Some(isa),
+                                            error,
+                                        ))
+                                    })?;
+                                Some(ranges)
                             } else {
                                 None
                             };

crates/jit/src/compiler.rs

@@ -10,6 +10,7 @@ use alloc::vec::Vec;
 use core::convert::TryFrom;
 use cranelift_codegen::ir::InstBuilder;
 use cranelift_codegen::isa::{TargetFrontendConfig, TargetIsa};
+use cranelift_codegen::print_errors::pretty_error;
 use cranelift_codegen::Context;
 use cranelift_codegen::{binemit, ir};
 use cranelift_entity::{EntityRef, PrimaryMap};
@@ -336,7 +337,13 @@ fn make_trampoline(
             &mut trap_sink,
             &mut stackmap_sink,
         )
-        .map_err(|error| SetupError::Compile(CompileError::Codegen(error)))?;
+        .map_err(|error| {
+            SetupError::Compile(CompileError::Codegen(pretty_error(
+                &context.func,
+                Some(isa),
+                error,
+            )))
+        })?;
 
     context.emit_unwind_info(isa, &mut unwind_info);