diff options
| author | Tamir Duberstein <tamird@gmail.com> | 2015-04-27 14:10:49 -0700 |
|---|---|---|
| committer | Tamir Duberstein <tamird@gmail.com> | 2015-04-28 17:23:45 -0700 |
| commit | 69abc12b0044d641e714bdd73a299cfa4136b7b8 (patch) | |
| tree | b434c9c4a9b8260632c8a6c20823c95a8f5a02e7 /src/libstd/rt | |
| parent | 8871c17b76a1e0ab36ce2bb51008b53f596e5b3c (diff) | |
| download | rust-69abc12b0044d641e714bdd73a299cfa4136b7b8.tar.gz rust-69abc12b0044d641e714bdd73a299cfa4136b7b8.zip | |
Register new snapshots
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index c880aae80fc..a764b99e280 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -510,23 +510,6 @@ pub fn begin_unwind_fmt(msg: fmt::Arguments, file_line: &(&'static str, u32)) -> /// This is the entry point of unwinding for panic!() and assert!(). #[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible -#[cfg(stage0)] -pub fn begin_unwind<M: Any + Send>(msg: M, file_line: &(&'static str, usize)) -> ! { - // 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, - // but then again we're not really ready for panic on OOM anyway. If - // we do start doing this, then we should propagate this allocation to - // be performed in the parent of this thread instead of the thread that's - // panicking. - - // see below for why we do the `Any` coercion here. - let (file, line) = *file_line; - begin_unwind_inner(Box::new(msg), &(file, line as u32)) -} - -/// This is the entry point of unwinding for panic!() and assert!(). -#[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible -#[cfg(not(stage0))] pub fn begin_unwind<M: Any + Send>(msg: M, file_line: &(&'static str, u32)) -> ! { // 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, |
