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

Add and use a From impl from CodegenError to ModuleError

Browse Source 
This will also improve reporting of the chain of errors.
This commit is contained in:
Josh Triplett
2019-10-30 08:02:16 -07:00
committed by Dan Gohman
parent 7e725cf880
commit d6b3ca28b4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cranelift/module/src/module.rs
View File

@@ -141,7 +141,7 @@ pub enum ModuleError {
InvalidImportDefinition(String), InvalidImportDefinition(String),
/// Wraps a `cranelift-codegen` error /// Wraps a `cranelift-codegen` error
#[error("Compilation error: {0}")] #[error("Compilation error: {0}")]
Compilation(CodegenError), Compilation(#[from] CodegenError),
/// Wraps a generic error from a backend /// Wraps a generic error from a backend
#[error("Backend error: {0}")] #[error("Backend error: {0}")]
Backend(String), Backend(String),
@@ -549,9 +549,7 @@ where
func, func,
ctx.func.display(self.backend.isa()) ctx.func.display(self.backend.isa())
); );
let CodeInfo { total_size, .. } = ctx let CodeInfo { total_size, .. } = ctx.compile(self.backend.isa())?;
.compile(self.backend.isa())
.map_err(ModuleError::Compilation)?;
let info = &self.contents.functions[func]; let info = &self.contents.functions[func];
if info.compiled.is_some() { if info.compiled.is_some() {
return Err(ModuleError::DuplicateDefinition(info.decl.name.clone())); return Err(ModuleError::DuplicateDefinition(info.decl.name.clone()));