make emit_fde Result-y as well

bytecodealliance · Apr 9, 2020 · 87b7017 · 87b7017
1 parent 6f0bdbe
commit 87b7017
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cranelift/codegen/src/isa/x86/abi.rs b/cranelift/codegen/src/isa/x86/abi.rs
@@ -1161,7 +1161,7 @@ pub fn emit_unwind_info(
         }
         FrameUnwindKind::Libunwind => {
             if func.frame_layout.is_some() {
-                emit_fde(func, isa, sink);
+                emit_fde(func, isa, sink)?;
             }
         }
     }

diff --git a/cranelift/codegen/src/isa/x86/fde.rs b/cranelift/codegen/src/isa/x86/fde.rs
@@ -3,6 +3,7 @@
 use crate::binemit::{FrameUnwindOffset, FrameUnwindSink, Reloc};
 use crate::ir::{FrameLayoutChange, Function};
 use crate::isa::{CallConv, RegUnit, TargetIsa};
+use crate::result::CodegenResult;
 use alloc::vec::Vec;
 use core::convert::TryInto;
 use gimli::write::{
@@ -169,7 +170,11 @@ fn to_cfi(
 }
 
 /// Creates FDE structure from FrameLayout.
-pub fn emit_fde(func: &Function, isa: &dyn TargetIsa, sink: &mut dyn FrameUnwindSink) {
+pub fn emit_fde(
+    func: &Function,
+    isa: &dyn TargetIsa,
+    sink: &mut dyn FrameUnwindSink,
+) -> CodegenResult<()> {
     assert!(isa.name() == "x86");
 
     // Expecting function with System V prologue
@@ -257,6 +262,8 @@ pub fn emit_fde(func: &Function, isa: &dyn TargetIsa, sink: &mut dyn FrameUnwind
 
     // Need 0 marker for GCC unwind to end FDE "list".
     sink.bytes(&[0, 0, 0, 0]);
+
+    Ok(())
 }
 
 #[cfg(test)]
@@ -305,7 +312,7 @@ mod tests {
         context.compile(&*isa).expect("expected compilation");
 
         let mut sink = SimpleUnwindSink(Vec::new(), 0, Vec::new());
-        emit_fde(&context.func, &*isa, &mut sink);
+        emit_fde(&context.func, &*isa, &mut sink).expect("can emit fde");
 
         assert_eq!(
             sink.0,
@@ -367,7 +374,7 @@ mod tests {
         context.compile(&*isa).expect("expected compilation");
 
         let mut sink = SimpleUnwindSink(Vec::new(), 0, Vec::new());
-        emit_fde(&context.func, &*isa, &mut sink);
+        emit_fde(&context.func, &*isa, &mut sink).expect("can emit fde");
 
         assert_eq!(
             sink.0,