user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '09fae60a86' into sync_cg_clif-2024-03-28

Browse source
This commit is contained in:
bjorn3 2024-03-28 11:43:35 +00:00
commit 987ed345af
24 changed files with 840 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_codegen_cranelift/src/debuginfo/unwind.rs
View file

@ -3,9 +3,10 @@
use cranelift_codegen::ir::Endianness;
use cranelift_codegen::isa::{unwind::UnwindInfo, TargetIsa};
use cranelift_object::ObjectProduct;
use gimli::write::{Address, CieId, EhFrame, FrameTable, Section};
use gimli::write::{CieId, EhFrame, FrameTable, Section};
use gimli::RunTimeEndian;
use super::emit::address_for_func;
use super::object::WriteDebugInfo;
use crate::prelude::*;
@ -47,11 +48,8 @@ impl UnwindContext {
match unwind_info {
UnwindInfo::SystemV(unwind_info) => {
self.frame_table.add_fde(
self.cie_id.unwrap(),
unwind_info
.to_fde(Address::Symbol { symbol: func_id.as_u32() as usize, addend: 0 }),
);
self.frame_table
.add_fde(self.cie_id.unwrap(), unwind_info.to_fde(address_for_func(func_id)));
}
UnwindInfo::WindowsX64(_) => {
// FIXME implement this