Merge pull request #2845 from bnjbvr/fix-unwind-win64-old-backend

Generate unwind information on Win64 with the old backend
bytecodealliance · Apr 16, 2021 · f26449f · f26449f
2 parents ba73b45 + 8ab3511
commit f26449f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cranelift/codegen/src/isa/x86/unwind/winx64.rs b/cranelift/codegen/src/isa/x86/unwind/winx64.rs
@@ -2,15 +2,15 @@
 
 use crate::ir::Function;
 use crate::isa::x86::registers::{FPR, GPR};
-use crate::isa::{unwind::winx64::UnwindInfo, CallConv, RegUnit, TargetIsa};
+use crate::isa::{unwind::winx64::UnwindInfo, RegUnit, TargetIsa};
 use crate::result::CodegenResult;
 
 pub(crate) fn create_unwind_info(
     func: &Function,
     isa: &dyn TargetIsa,
 ) -> CodegenResult<Option<UnwindInfo>> {
     // Only Windows fastcall is supported for unwind information
-    if func.signature.call_conv != CallConv::WindowsFastcall || func.prologue_end.is_none() {
+    if !func.signature.call_conv.extends_windows_fastcall() || func.prologue_end.is_none() {
         return Ok(None);
     }