T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cranelift-faerie: upgrade to faerie 0.15.0, fix error reporting

Browse Source 
the `FaerieProduct` exposes faerie-specific types, so we can give
the `faerie::ArtifactError` on those methods.

`ModuleError::Backend` now expects an `anyhow::Error`, so we change
a .to_string into .into() and retain better error information.
This commit is contained in:
Pat Hickey
2020-03-13 11:52:40 -07:00
parent fdfda89d59
commit 2b87db3f55
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/faerie/Cargo.toml
View File

@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
cranelift-module = { path = "../module", version = "0.59.0" }
faerie = "0.14.0"
faerie = "0.15.0"
goblin = "0.1.0"
anyhow = "1.0"
target-lexicon = "0.10"

16
cranelift/faerie/src/backend.rs
View File

@@ -2,7 +2,7 @@
use crate::container;
use crate::traps::{FaerieTrapManifest, FaerieTrapSink};
use anyhow::Error;
use anyhow::anyhow;
use cranelift_codegen::binemit::{
Addend, CodeOffset, NullStackmapSink, NullTrapSink, Reloc, RelocSink, Stackmap, StackmapSink,
};
@@ -57,9 +57,9 @@ impl FaerieBuilder {
libcall_names: Box<dyn Fn(ir::LibCall) -> String>,
) -> ModuleResult<Self> {
if !isa.flags().is_pic() {
return Err(ModuleError::Backend(
"faerie requires TargetIsa be PIC".to_owned(),
));
return Err(ModuleError::Backend(anyhow!(
"faerie requires TargetIsa be PIC"
)));
}
Ok(Self {
isa,
@@ -257,7 +257,7 @@ impl Backend for FaerieBackend {
to,
at: u64::from(offset),
})
.map_err(|e| ModuleError::Backend(e.to_string()))?;
.map_err(|e| ModuleError::Backend(e.into()))?;
}
for &(offset, id, addend) in data_relocs {
debug_assert_eq!(
@@ -271,7 +271,7 @@ impl Backend for FaerieBackend {
to,
at: u64::from(offset),
})
.map_err(|e| ModuleError::Backend(e.to_string()))?;
.map_err(|e| ModuleError::Backend(e.into()))?;
}
match *init {
@@ -369,12 +369,12 @@ impl FaerieProduct {
}
/// Call `emit` on the faerie `Artifact`, producing bytes in memory.
pub fn emit(&self) -> Result<Vec<u8>, Error> {
pub fn emit(&self) -> Result<Vec<u8>, faerie::ArtifactError> {
self.artifact.emit()
}
/// Call `write` on the faerie `Artifact`, writing to a file.
pub fn write(&self, sink: File) -> Result<(), Error> {
pub fn write(&self, sink: File) -> Result<(), faerie::ArtifactError> {
self.artifact.write(sink)
}
}