Skip to content

Commit 1a0ee47

Browse files
committed
Delete unneeded StackFrame::object_base
1 parent 90c96ea commit 1a0ee47

File tree

4 files changed

+0
-5
lines changed

4 files changed

+0
-5
lines changed

unwind/src/find_cfi/baremetal.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ pub fn find_cfi_sections() -> Vec<EhRef> {
2525
let eh_frame_end = &__ehframe_end as *const _ as u64;
2626

2727
cfi.push(EhRef {
28-
obj_base: 0,
2928
text,
3029
eh_frame_hdr,
3130
eh_frame_end,

unwind/src/find_cfi/ld.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ extern "C" fn callback(info: *const DlPhdrInfo, size: usize, data: *mut c_void)
6666
// This is an upper bound, not the exact address.
6767
let eh_frame_end = (*info).addr + max_vaddr;
6868
(*data).push(EhRef {
69-
obj_base: (*info).addr,
7069
text: AddrRange { start: start_addr, end: start_addr + text.memsz },
7170
eh_frame_hdr: AddrRange { start: eh_frame_hdr_start, end: eh_frame_hdr_start + eh_frame_hdr.memsz },
7271
eh_frame_end,

unwind/src/find_cfi/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use range::AddrRange;
22

33
#[derive(Debug)]
44
pub struct EhRef {
5-
pub obj_base: u64,
65
pub text: AddrRange,
76
pub eh_frame_hdr: AddrRange,
87
pub eh_frame_end: u64,

unwind/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub struct StackFrame {
2828
personality: Option<u64>,
2929
lsda: Option<u64>,
3030
initial_address: u64,
31-
pub object_base: u64, // FIXME hack, remove this
3231
}
3332

3433
pub trait Unwinder: Default {
@@ -213,7 +212,6 @@ impl<'a> FallibleIterator for StackFrames<'a> {
213212
self.state = Some((row, cfa));
214213

215214
Ok(Some(StackFrame {
216-
object_base: rec.er.obj_base,
217215
personality: personality.map(|x| unsafe { deref_ptr(x) }),
218216
lsda: lsda.map(|x| unsafe { deref_ptr(x) }),
219217
initial_address,

0 commit comments

Comments
 (0)