Rollup merge of #54590 - alexcrichton:inline-never-rust-panic, r=dtolnay

kennytm · kennytm · commit 0ca68bb82a2d · 2018-09-29T16:43:32.000+08:00
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 #49013
diff --git 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) -> ! {

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,7 @@ pub fn update_count_then_panic(msg: Box<dyn Any + Send>) -> ! {`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`/// A private no-mangle function on which to slap yer breakpoints.`
	`520`	`+#[inline(never)]`
`520`	`521`	`#[no_mangle]`
`521`	`522`	`#[allow(private_no_mangle_fns)] // yes we get it, but we like breakpoints`
`522`	`523`	`pub fn rust_panic(mut msg: &mut dyn BoxMeUp) -> ! {`