diff options
| -rw-r--r-- | src/libcore/panicking.rs | 13 | ||||
| -rw-r--r-- | src/libstd/panicking.rs | 11 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/libcore/panicking.rs b/src/libcore/panicking.rs index 67c0b6ada90..834fcd246c5 100644 --- a/src/libcore/panicking.rs +++ b/src/libcore/panicking.rs @@ -40,13 +40,13 @@ use fmt; use panic::{Location, PanicInfo}; #[cold] -// inline(never) is required even in panic_immediate_abort mode, lest linker error -#[inline(never)] +// never inline unless panic_immediate_abort to avoid code bloat at the call sites as much as possible +#[cfg_attr(not(feature="panic_immediate_abort"),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 @@ -59,14 +59,13 @@ pub fn panic(expr_file_line_col: &(&'static str, &'static str, u32, u32)) -> ! { } #[cold] -// inline(never) is required even in panic_immediate_abort mode, lest linker error -#[inline(never)] +#[cfg_attr(not(feature="panic_immediate_abort"),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) @@ -78,7 +77,7 @@ fn panic_bounds_check(file_line_col: &(&'static str, u32, u32), 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 diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 29a0b3feefd..82ceec62f35 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -335,13 +335,15 @@ pub fn rust_begin_panic(info: &PanicInfo) -> ! { reason = "used by the panic! macro", issue = "0")] #[cold] +// If panic_immediate_abort, inline the abort call, +// otherwise avoid inlining because of it is cold path. #[cfg_attr(not(feature="panic_immediate_abort"),inline(never))] #[cfg_attr( feature="panic_immediate_abort" ,inline)] 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( @@ -404,14 +406,13 @@ fn continue_panic_fmt(info: &PanicInfo) -> ! { reason = "used by the panic! macro", issue = "0")] #[cfg_attr(not(test), lang = "begin_panic")] -// 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)] +// never inline unless panic_immediate_abort to avoid code bloat at the call sites as much as possible +#[cfg_attr(not(feature="panic_immediate_abort"),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, |