Merge pull request #2838 from uweigand/optionalfp

Allow unwind support to work without a frame pointer
2021-04-14 10:58:51 -07:00
parent 337cc47d2f 5904c09682
commit 1f21b32e99
6 changed files with 47 additions and 15 deletions
--- a/cranelift/codegen/src/isa/x64/inst/unwind/systemv.rs
+++ b/cranelift/codegen/src/isa/x64/inst/unwind/systemv.rs
@@ -89,8 +89,8 @@ impl crate::isa::unwind::systemv::RegisterMapper<Reg> for RegisterMapper {
    fn sp(&self) -> u16 {
        X86_64::RSP.0
    }
-    fn fp(&self) -> u16 {
-        X86_64::RBP.0
+    fn fp(&self) -> Option<u16> {
+        Some(X86_64::RBP.0)
    }
 }