Skip to content

Commit 00d223b

Browse files
committed
Ensure the personality does not panic
In a cdylib that uses std and is free from panics in the code, the panic machinery will *still* be pulled in because of the personality function when using LLD. The personality function is used by unwinding to figure out what to do when unwinding through a function. Each function that participates in unwind has an associated FDE (frame descriptor entries) in `.eh_frame`. This FDE points to a CIE (common information entry), which can reference a language-specific personality function, like `rust_eh_personality` in our case. As long as there is a CIE that references the personality, the function cannot be removed. If all references to a CIE get removed (because the functions and their associated FDEs have been removed), LLD will not remove the CIE, likely due to the ordering of its passes). Binutils ld will remove it. In the case where the CIE is still around (despite not being used), it will still reference the personality function, so that will still be around. This is not great since it's a bunch of code, but also not _that_ much. But this is where panicking comes in. Before this change, the personality function internally made use of `dyn Fn`. This caused an indirect call that LLVM was not able to analyze as guaranteed free of unwinding, even during fat LTO. This meant that an `invoke` was used, with a landing pad. In an `extern "C"` function, which the personality function is, all landing pads call `panic_cannot_unwind`, which is a `panic_nounwind`, which is, obviously, a panic. And as a panic, it pulls in *all* the panic machinery, which is very big and sad. It is also completely unnecessary, because these indirect functions do not panic, as they are just a convenient abstraction provided from the outside. By restructuring the code to remove these indirect calls, LLVM is able to fully analyze everything and see that rust_eh_personality cannot panic, and therefore remove its landing pad. With this change, exporting a panic-free function from a cdylib will only contain the function and the personality (when linked with LLD at least, with binutils ld it will only contain the function), with no panic code being present at all, which is great.
1 parent f464759 commit 00d223b

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

library/std/src/sys/personality/dwarf/eh.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ pub const DW_EH_PE_aligned: u8 = 0x50;
3737
pub const DW_EH_PE_indirect: u8 = 0x80;
3838

3939
#[derive(Copy, Clone)]
40-
pub struct EHContext<'a> {
41-
pub ip: *const u8, // Current instruction pointer
42-
pub func_start: *const u8, // Pointer to the current function
43-
pub get_text_start: &'a dyn Fn() -> *const u8, // Get pointer to the code section
44-
pub get_data_start: &'a dyn Fn() -> *const u8, // Get pointer to the data section
40+
pub(crate) struct EHContext {
41+
pub(crate) ip: *const u8, // Current instruction pointer
42+
pub(crate) func_start: *const u8, // Pointer to the current function
43+
pub(crate) raw_context: *mut unwind::_Unwind_Context,
4544
}
4645

4746
/// Landing pad.
@@ -63,7 +62,7 @@ pub enum EHAction {
6362
pub const USING_SJLJ_EXCEPTIONS: bool =
6463
cfg!(all(target_vendor = "apple", not(target_os = "watchos"), target_arch = "arm"));
6564

66-
pub unsafe fn find_eh_action(lsda: *const u8, context: &EHContext<'_>) -> Result<EHAction, ()> {
65+
pub unsafe fn find_eh_action(lsda: *const u8, context: &EHContext) -> Result<EHAction, ()> {
6766
if lsda.is_null() {
6867
return Ok(EHAction::None);
6968
}
@@ -224,7 +223,7 @@ unsafe fn read_encoded_offset(reader: &mut DwarfReader, encoding: u8) -> Result<
224223
/// [LSB-dwarf-ext]: https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/dwarfext.html
225224
unsafe fn read_encoded_pointer(
226225
reader: &mut DwarfReader,
227-
context: &EHContext<'_>,
226+
context: &EHContext,
228227
encoding: u8,
229228
) -> Result<*const u8, ()> {
230229
if encoding == DW_EH_PE_omit {
@@ -241,8 +240,8 @@ unsafe fn read_encoded_pointer(
241240
}
242241
context.func_start
243242
}
244-
DW_EH_PE_textrel => (*context.get_text_start)(),
245-
DW_EH_PE_datarel => (*context.get_data_start)(),
243+
DW_EH_PE_textrel => unsafe { unwind::_Unwind_GetTextRelBase(context.raw_context) },
244+
DW_EH_PE_datarel => unsafe { unwind::_Unwind_GetDataRelBase(context.raw_context) },
246245
// aligned means the value is aligned to the size of a pointer
247246
DW_EH_PE_aligned => {
248247
reader.ptr = reader.ptr.with_addr(round_up(reader.ptr.addr(), size_of::<*const u8>())?);

library/std/src/sys/personality/gcc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,7 @@ unsafe fn find_eh_action(context: *mut uw::_Unwind_Context) -> Result<EHAction,
332332
// `ip = -1` has special meaning, so use wrapping sub to allow for that
333333
ip: if ip_before_instr != 0 { ip } else { ip.wrapping_sub(1) },
334334
func_start: uw::_Unwind_GetRegionStart(context),
335-
get_text_start: &|| uw::_Unwind_GetTextRelBase(context),
336-
get_data_start: &|| uw::_Unwind_GetDataRelBase(context),
335+
raw_context: context,
337336
};
338337
eh::find_eh_action(lsda, &eh_context)
339338
}

0 commit comments

Comments
 (0)