wasmtime-cranelift: Use wasmtime_environ::error instead of anyhow (#12204)

Author: fitzgen

Cargo.lock

@@ -15,7 +15,6 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
-anyhow = { workspace = true }
 log = { workspace = true }
 wasmtime-environ = { workspace = true, features = ['compile'] }
 cranelift-codegen = { workspace = true, features = ["host-arch", "timing"] }

crates/cranelift/Cargo.toml

@@ -4,7 +4,6 @@
 //! well as providing a function to return the default configuration to build.
 
 use crate::isa_builder::IsaBuilder;
-use anyhow::Result;
 use cranelift_codegen::{
     CodegenResult,
     isa::{self, OwnedTargetIsa},
@@ -13,6 +12,7 @@ use std::fmt;
 use std::path;
 use std::sync::Arc;
 use target_lexicon::Triple;
+use wasmtime_environ::error::Result;
 use wasmtime_environ::{CacheStore, CompilerBuilder, Setting, Tunables};
 
 struct Builder {

crates/cranelift/src/builder.rs

@@ -4,7 +4,6 @@ use crate::func_environ::FuncEnvironment;
 use crate::translate::FuncTranslator;
 use crate::{BuiltinFunctionSignatures, builder::LinkOptions, wasm_call_signature};
 use crate::{CompiledFunction, ModuleTextBuilder, array_call_signature};
-use anyhow::{Context as _, Result};
 use cranelift_codegen::binemit::CodeOffset;
 use cranelift_codegen::inline::InlineCommand;
 use cranelift_codegen::ir::condcodes::IntCC;
@@ -32,6 +31,7 @@ use std::ops::Range;
 use std::path;
 use std::sync::{Arc, Mutex};
 use wasmparser::{FuncValidatorAllocations, FunctionBody};
+use wasmtime_environ::error::{Context as _, Result};
 use wasmtime_environ::obj::{ELF_WASMTIME_EXCEPTIONS, ELF_WASMTIME_FRAMES};
 use wasmtime_environ::{
     Abi, AddressMapSection, BuiltinFunctionIndex, CacheStore, CompileError, CompiledFunctionBody,
@@ -1579,7 +1579,7 @@ fn clif_to_env_exception_tables<'a>(
     builder: &mut ExceptionTableBuilder,
     range: Range<u64>,
     call_sites: impl Iterator<Item = FinalizedMachCallSite<'a>>,
-) -> anyhow::Result<()> {
+) -> wasmtime_environ::error::Result<()> {
     builder.add_func(CodeOffset::try_from(range.start).unwrap(), call_sites)
 }
 
@@ -1591,7 +1591,7 @@ fn clif_to_env_frame_tables<'a>(
     tag_sites: impl Iterator<Item = MachBufferDebugTagList<'a>>,
     frame_layout: &MachBufferFrameLayout,
     frame_descriptors: &HashMap<FuncKey, Vec<u8>>,
-) -> anyhow::Result<()> {
+) -> wasmtime_environ::error::Result<()> {
     let mut frame_descriptor_indices = HashMap::new();
     for tag_site in tag_sites {
         // Split into frames; each has three debug tags.
@@ -1647,7 +1647,7 @@ fn clif_to_env_breakpoints(
     range: Range<u64>,
     breakpoint_patches: impl Iterator<Item = (u32, Range<u32>)>,
     patch_table: &mut Vec<(u32, Range<u32>)>,
-) -> anyhow::Result<()> {
+) -> wasmtime_environ::error::Result<()> {
     patch_table.extend(breakpoint_patches.map(|(wasm_pc, offset_range)| {
         let start = offset_range.start + u32::try_from(range.start).unwrap();
         let end = offset_range.end + u32::try_from(range.start).unwrap();

crates/cranelift/src/compiler.rs

@@ -1,11 +1,11 @@
 //! Compilation support for the component model.
 
 use crate::{TRAP_ALWAYS, TRAP_CANNOT_ENTER, TRAP_INTERNAL_ASSERT, compiler::Compiler};
-use anyhow::{Result, bail};
 use cranelift_codegen::ir::condcodes::IntCC;
 use cranelift_codegen::ir::{self, InstBuilder, MemFlags, Value};
 use cranelift_codegen::isa::{CallConv, TargetIsa};
 use cranelift_frontend::FunctionBuilder;
+use wasmtime_environ::error::{Result, bail};
 use wasmtime_environ::{
     Abi, CompiledFunctionBody, EntityRef, FuncKey, HostCall, PtrSize, TrapSentinel, Tunables,
     WasmFuncType, WasmValType, component::*, fact::PREPARE_CALL_FIXED_PARAMS,

crates/cranelift/src/compiler/component.rs

@@ -7,11 +7,11 @@ use super::range_info_builder::RangeInfoBuilder;
 use super::refs::{PendingDebugInfoRefs, PendingUnitRefs};
 use super::unit::InheritedAttr;
 use super::{TransformError, dbi_log};
-use anyhow::{Error, bail};
 use cranelift_codegen::isa::TargetIsa;
 use gimli::{
     AttributeValue, DebugLineOffset, DebuggingInformationEntry, UnitOffset, UnitRef, write,
 };
+use wasmtime_environ::error::{Error, bail};
 
 #[derive(Debug)]
 pub(crate) enum EntryAttributesContext<'a> {

crates/cranelift/src/debug/transform/attr.rs

@@ -5,7 +5,6 @@ use crate::debug::transform::debug_transform_logging::{
     dbi_log_enabled, log_get_value_loc, log_get_value_name, log_get_value_ranges,
 };
 use crate::translate::get_vmctx_value_label;
-use anyhow::{Context, Error, Result};
 use core::fmt;
 use cranelift_codegen::LabelValueLoc;
 use cranelift_codegen::ValueLabelsRanges;
@@ -17,6 +16,7 @@ use std::cmp::PartialEq;
 use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
 use std::rc::Rc;
+use wasmtime_environ::error::{Context, Error, Result};
 
 #[derive(Debug)]
 pub struct FunctionFrameInfo<'a> {

crates/cranelift/src/debug/transform/expression.rs

@@ -1,9 +1,9 @@
 use super::TransformError;
 use super::address_transform::AddressTransform;
 use crate::debug::Reader;
-use anyhow::{Error, bail};
 use gimli::{DebugLineOffset, LineEncoding, UnitRef, write};
 use wasmtime_environ::DefinedFuncIndex;
+use wasmtime_environ::error::{Error, bail};
 
 #[derive(Debug)]
 enum SavedLineProgramRow {

crates/cranelift/src/debug/transform/line_program.rs

@@ -4,12 +4,12 @@ use self::simulate::generate_simulated_dwarf;
 use self::unit::clone_unit;
 use crate::debug::gc::build_dependencies;
 use crate::debug::{Compilation, Reader};
-use anyhow::Error;
 use cranelift_codegen::isa::TargetIsa;
 use gimli::{Dwarf, DwarfPackage, LittleEndian, Section, Unit, UnitRef, UnitSectionOffset, write};
 use std::{collections::HashSet, fmt::Debug};
 use synthetic::ModuleSyntheticUnit;
 use thiserror::Error;
+use wasmtime_environ::error::Error;
 use wasmtime_environ::{
     DefinedFuncIndex, ModuleTranslation, PrimaryMap, StaticModuleIndex, Tunables,
 };
@@ -54,11 +54,11 @@ pub(crate) struct DebugInputContext<'a> {
 fn load_dwp<'data>(
     translation: ModuleTranslation<'data>,
     buffer: &'data [u8],
-) -> anyhow::Result<DwarfPackage<gimli::EndianSlice<'data, gimli::LittleEndian>>> {
+) -> wasmtime_environ::error::Result<DwarfPackage<gimli::EndianSlice<'data, gimli::LittleEndian>>> {
     let endian_slice = gimli::EndianSlice::new(buffer, LittleEndian);
 
     let dwarf_package = DwarfPackage::load(
-        |id| -> anyhow::Result<_> {
+        |id| -> wasmtime_environ::error::Result<_> {
             let slice = match id {
                 gimli::SectionId::DebugAbbrev => {
                     translation.debuginfo.dwarf.debug_abbrev.reader().slice()

crates/cranelift/src/debug/transform/mod.rs

@@ -1,8 +1,8 @@
 use super::address_transform::AddressTransform;
 use crate::debug::Reader;
-use anyhow::Error;
 use gimli::{AttributeValue, DebuggingInformationEntry, RangeListsOffset, UnitRef, write};
 use wasmtime_environ::DefinedFuncIndex;
+use wasmtime_environ::error::Error;
 
 pub(crate) enum RangeInfoBuilder {
     Undefined,