about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-09-29 13:21:15 +0800
committerkennytm <kennytm@gmail.com>2018-09-29 16:43:32 +0800
commit0ca68bb82a2df80584a04dc22573ba01fcef9621 (patch)
tree84dc89ed8aed508dbb8ec38dfab5531a83f10afd /src/libstd
parenta6d0599a6429d1f6727316ee43732f53ec1e4f49 (diff)
parent243030b1408a70f073878e5a206d46d43fc60dab (diff)
downloadrust-0ca68bb82a2df80584a04dc22573ba01fcef9621.tar.gz
rust-0ca68bb82a2df80584a04dc22573ba01fcef9621.zip
Rollup merge of #54590 - alexcrichton:inline-never-rust-panic, r=dtolnay
std: Don't let `rust_panic` get inlined

It's meant for breakpoints, so if it gets inlined we can't set a
breakpoint on it easily!

Will hopefully help fix at least one aspect of https://github.com/rust-lang/rust/issues/49013
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panicking.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index 6eb2db8e63b..f79c986cc89 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -517,6 +517,7 @@ pub fn update_count_then_panic(msg: Box<dyn Any + Send>) -> ! {
 }
 
 /// A private no-mangle function on which to slap yer breakpoints.
+#[inline(never)]
 #[no_mangle]
 #[allow(private_no_mangle_fns)] // yes we get it, but we like breakpoints
 pub fn rust_panic(mut msg: &mut dyn BoxMeUp) -> ! {