-
Notifications
You must be signed in to change notification settings - Fork 14.1k
Add libstd Cargo feature "panic_immediate_abort" #55011
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,9 +39,15 @@ | |
| use fmt; | ||
| use panic::{Location, PanicInfo}; | ||
|
|
||
| #[cold] #[inline(never)] // this is the slow path, always | ||
| #[cold] | ||
| // inline(never) is required even in panic_immediate_abort mode, lest linker error | ||
| #[inline(never)] | ||
| #[lang = "panic"] | ||
| pub fn panic(expr_file_line_col: &(&'static str, &'static str, u32, u32)) -> ! { | ||
| if cfg!(feature = "panic_immediate_abort") { | ||
| unsafe { super::intrinsics::abort() } | ||
| }; | ||
|
||
|
|
||
| // Use Arguments::new_v1 instead of format_args!("{}", expr) to potentially | ||
| // reduce size overhead. The format_args! macro uses str's Display trait to | ||
| // write expr, which calls Formatter::pad, which must accommodate string | ||
|
|
@@ -52,16 +58,28 @@ pub fn panic(expr_file_line_col: &(&'static str, &'static str, u32, u32)) -> ! { | |
| panic_fmt(fmt::Arguments::new_v1(&[expr], &[]), &(file, line, col)) | ||
| } | ||
|
|
||
| #[cold] #[inline(never)] | ||
| #[cold] | ||
| // inline(never) is required even in panic_immediate_abort mode, lest linker error | ||
| #[inline(never)] | ||
| #[lang = "panic_bounds_check"] | ||
| fn panic_bounds_check(file_line_col: &(&'static str, u32, u32), | ||
| index: usize, len: usize) -> ! { | ||
| if cfg!(feature = "panic_immediate_abort") { | ||
| unsafe { super::intrinsics::abort() } | ||
| }; | ||
|
||
|
|
||
| panic_fmt(format_args!("index out of bounds: the len is {} but the index is {}", | ||
| len, index), file_line_col) | ||
| } | ||
|
|
||
| #[cold] #[inline(never)] | ||
| #[cold] | ||
| #[cfg_attr(not(feature="panic_immediate_abort"),inline(never))] | ||
| #[cfg_attr( feature="panic_immediate_abort" ,inline)] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could a brief comment be added for what this pattern is doing? |
||
| pub fn panic_fmt(fmt: fmt::Arguments, file_line_col: &(&'static str, u32, u32)) -> ! { | ||
| if cfg!(feature = "panic_immediate_abort") { | ||
| unsafe { super::intrinsics::abort() } | ||
| }; | ||
|
||
|
|
||
| // NOTE This function never crosses the FFI boundary; it's a Rust-to-Rust call | ||
| #[allow(improper_ctypes)] // PanicInfo contains a trait object which is not FFI safe | ||
| extern "Rust" { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -334,9 +334,15 @@ pub fn rust_begin_panic(info: &PanicInfo) -> ! { | |
| #[unstable(feature = "libstd_sys_internals", | ||
| reason = "used by the panic! macro", | ||
| issue = "0")] | ||
| #[inline(never)] #[cold] | ||
| #[cold] | ||
| #[cfg_attr(not(feature="panic_immediate_abort"),inline(never))] | ||
| #[cfg_attr( feature="panic_immediate_abort" ,inline)] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could a comment be added here pointing to libcore's comment? |
||
| pub fn begin_panic_fmt(msg: &fmt::Arguments, | ||
| file_line_col: &(&'static str, u32, u32)) -> ! { | ||
| if cfg!(feature = "panic_immediate_abort") { | ||
| unsafe { intrinsics::abort() } | ||
| }; | ||
|
||
|
|
||
| let (file, line, col) = *file_line_col; | ||
| let info = PanicInfo::internal_constructor( | ||
| Some(msg), | ||
|
|
@@ -398,8 +404,15 @@ fn continue_panic_fmt(info: &PanicInfo) -> ! { | |
| reason = "used by the panic! macro", | ||
| issue = "0")] | ||
| #[cfg_attr(not(test), lang = "begin_panic")] | ||
| #[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible | ||
| // avoid code bloat at the call sites as much as possible | ||
| // inline(never) is required even in panic_immediate_abort mode, lest linker error | ||
| #[inline(never)] | ||
| #[cold] | ||
| pub fn begin_panic<M: Any + Send>(msg: M, file_line_col: &(&'static str, u32, u32)) -> ! { | ||
| if cfg!(feature = "panic_immediate_abort") { | ||
| unsafe { intrinsics::abort() } | ||
| }; | ||
|
|
||
| // Note that this should be the only allocation performed in this code path. | ||
| // Currently this means that panic!() on OOM will invoke this code path, | ||
| // but then again we're not really ready for panic on OOM anyway. If | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It makes sense to me that
#[inline]would cause a linker error, but does omitting the attribute entirely also cause a link error? (it's best to avoidinline(never)if we can in panic-immediate-abort mode)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, omitting
#[inline]resolved the linker error. Updated the patch.