OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

panic_handler -> begin_panic_handler (and more comments)

This commit is contained in:
Ralf Jung 2019-11-26 08:18:57 +01:00
parent 3c48579551
commit 3a8e1b63cf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libstd/panicking.rs
View File

@ -316,16 +316,17 @@ pub fn begin_panic_fmt(msg: &fmt::Arguments<'_>,
unsafe { intrinsics::abort() }
}
// Just package everything into a `PanicInfo` and continue like libcore panics.
let (file, line, col) = *file_line_col;
let location = Location::internal_constructor(file, line, col);
let info = PanicInfo::internal_constructor(Some(msg), &location);
panic_handler(&info)
begin_panic_handler(&info)
}
/// Entry point of panic from the libcore crate (`panic_impl` lang item).
/// Entry point of panics from the libcore crate (`panic_impl` lang item).
#[cfg_attr(not(test), panic_handler)]
#[unwind(allowed)]
fn panic_handler(info: &PanicInfo<'_>) -> ! {
pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! {
struct PanicPayload<'a> {
inner: &'a fmt::Arguments<'a>,
string: Option<String>,
@ -374,7 +375,9 @@ fn panic_handler(info: &PanicInfo<'_>) -> ! {
&file_line_col);
}
/// This is the entry point of panicking for panic!() and assert!().
/// This is the entry point of panicking for the non-format-string variants of
/// panic!() and assert!(). In particular, this is the only entry point that supports
/// arbitrary payloads, not just format strings.
#[unstable(feature = "libstd_sys_internals",
reason = "used by the panic! macro",
issue = "0")]