From 69abc12b0044d641e714bdd73a299cfa4136b7b8 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 27 Apr 2015 14:10:49 -0700 Subject: Register new snapshots --- src/libstd/rt/unwind.rs | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/libstd/rt') 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(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(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, -- cgit 1.4.1-3-g733a5