Add JITBuilder::with_flags constructor (#5751)

This allows custom flags to be set (e.g. `opt-level`) while still
leaving most of of the boilerplate to select the native target to
the `JITBuilder`.
This commit is contained in:
Amanieu d'Antras
2023-02-09 03:49:17 +01:00
committed by GitHub
parent 7c5c7e4b6d
commit a2d356d45e
2 changed files with 31 additions and 2 deletions

View File

@@ -11,6 +11,7 @@ use core::fmt::Display;
use cranelift_codegen::binemit::{CodeOffset, Reloc};
use cranelift_codegen::entity::{entity_impl, PrimaryMap};
use cranelift_codegen::ir::Function;
use cranelift_codegen::settings::SetError;
use cranelift_codegen::{binemit, MachReloc};
use cranelift_codegen::{ir, isa, CodegenError, CompileError, Context};
use std::borrow::ToOwned;
@@ -239,6 +240,9 @@ pub enum ModuleError {
/// Wraps a generic error from a backend
Backend(anyhow::Error),
/// Wraps an error from a flag definition.
Flag(SetError),
}
impl<'a> From<CompileError<'a>> for ModuleError {
@@ -260,6 +264,7 @@ impl std::error::Error for ModuleError {
Self::Compilation(source) => Some(source),
Self::Allocation { err: source, .. } => Some(source),
Self::Backend(source) => Some(&**source),
Self::Flag(source) => Some(source),
}
}
}
@@ -297,6 +302,7 @@ impl std::fmt::Display for ModuleError {
write!(f, "Allocation error: {}: {}", message, err)
}
Self::Backend(err) => write!(f, "Backend error: {}", err),
Self::Flag(err) => write!(f, "Flag error: {}", err),
}
}
}
@@ -307,6 +313,12 @@ impl std::convert::From<CodegenError> for ModuleError {
}
}
impl std::convert::From<SetError> for ModuleError {
fn from(source: SetError) -> Self {
Self::Flag { 0: source }
}
}
/// A convenient alias for a `Result` that uses `ModuleError` as the error type.
pub type ModuleResult<T> = Result<T, ModuleError>;