diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-28 15:09:26 -0800 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2018-02-28 15:09:26 -0800 |
| commit | 12515608cb6345e3a845288dfa552ed03e3b940d (patch) | |
| tree | cbcfa7bf061200520a14915668df56b60b6c2006 /src/libstd | |
| parent | fac7d7cfb2388b01a27f2165cff78c252726260c (diff) | |
| parent | 566c6ac6bac479d4977339fc91bb497cb96342c6 (diff) | |
| download | rust-12515608cb6345e3a845288dfa552ed03e3b940d.tar.gz rust-12515608cb6345e3a845288dfa552ed03e3b940d.zip | |
Rollup merge of #48380 - nikomatsakis:issue-48251-master, r=acrichto
Fixes #47311. r? @nrc
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/panicking.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 161c3fc7113..454ac64735c 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -55,7 +55,8 @@ extern { data: *mut u8, data_ptr: *mut usize, vtable_ptr: *mut usize) -> u32; - #[unwind] + #[cfg_attr(stage0, unwind)] + #[cfg_attr(not(stage0), unwind(allowed))] fn __rust_start_panic(data: usize, vtable: usize) -> u32; } @@ -315,7 +316,8 @@ pub fn panicking() -> bool { /// Entry point of panic from the libcore crate. #[cfg(not(test))] #[lang = "panic_fmt"] -#[unwind] +#[cfg_attr(stage0, unwind)] +#[cfg_attr(not(stage0), unwind(allowed))] pub extern fn rust_begin_panic(msg: fmt::Arguments, file: &'static str, line: u32, |