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

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

Browse Source 
Generate unwind information on Win64 with the old backend
This commit is contained in:
Benjamin Bouvier
2021-04-16 18:59:19 +02:00
committed by GitHub
parent ba73b458b8 8ab3511b3b
commit f26449f03d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cranelift/codegen/src/isa/x86/unwind/winx64.rs
View File

@@ -2,7 +2,7 @@
use crate::ir::Function; use crate::ir::Function;
use crate::isa::x86::registers::{FPR, GPR}; 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; use crate::result::CodegenResult;
pub(crate) fn create_unwind_info( pub(crate) fn create_unwind_info(
@@ -10,7 +10,7 @@ pub(crate) fn create_unwind_info(
isa: &dyn TargetIsa, isa: &dyn TargetIsa,
) -> CodegenResult<Option<UnwindInfo>> { ) -> CodegenResult<Option<UnwindInfo>> {
// Only Windows fastcall is supported for unwind information // 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); return Ok(None);
} }