diff --git a/src/libcore/failure.rs b/src/libcore/failure.rs index 4bc39db8ecf09..5965603770ba7 100644 --- a/src/libcore/failure.rs +++ b/src/libcore/failure.rs @@ -37,7 +37,7 @@ use intrinsics; #[lang="fail_"] fn fail_(expr: &'static str, file: &'static str, line: uint) -> ! { format_args!(|args| -> () { - begin_unwind(args, file, line); + begin_unwind(args, &(file, line)); }, "{}", expr); unsafe { intrinsics::abort() } @@ -48,18 +48,20 @@ fn fail_(expr: &'static str, file: &'static str, line: uint) -> ! { fn fail_bounds_check(file: &'static str, line: uint, index: uint, len: uint) -> ! { format_args!(|args| -> () { - begin_unwind(args, file, line); + begin_unwind(args, &(file, line)); }, "index out of bounds: the len is {} but the index is {}", len, index); unsafe { intrinsics::abort() } } #[cold] -pub fn begin_unwind(fmt: &fmt::Arguments, file: &'static str, line: uint) -> ! { +pub fn begin_unwind(fmt: &fmt::Arguments, file_line: &(&'static str, uint)) -> ! { #[allow(ctypes)] extern { #[lang = "begin_unwind"] fn begin_unwind(fmt: &fmt::Arguments, file: &'static str, line: uint) -> !; } + let (file, line) = *file_line; unsafe { begin_unwind(fmt, file, line) } } + diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 93c838198c559..5373008612bb3 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -33,7 +33,8 @@ macro_rules! fail( // up with the number of calls to fail!() #[inline(always)] fn run_fmt(fmt: &::std::fmt::Arguments) -> ! { - ::core::failure::begin_unwind(fmt, file!(), line!()) + static FILE_LINE: (&'static str, uint) = (file!(), line!()); + ::core::failure::begin_unwind(fmt, &FILE_LINE) } format_args!(run_fmt, $fmt, $($arg)*) }); diff --git a/src/librustrt/lib.rs b/src/librustrt/lib.rs index e2d7f91d1a6f9..b7b5e09a5562a 100644 --- a/src/librustrt/lib.rs +++ b/src/librustrt/lib.rs @@ -33,7 +33,7 @@ extern crate collections; #[cfg(test)] #[phase(plugin, link)] extern crate std; pub use self::util::{Stdio, Stdout, Stderr}; -pub use self::unwind::{begin_unwind, begin_unwind_fmt, begin_unwind_no_time_to_explain}; +pub use self::unwind::{begin_unwind, begin_unwind_fmt}; use core::prelude::*; diff --git a/src/librustrt/unwind.rs b/src/librustrt/unwind.rs index cb1b6f46afe36..5dfeb15afb84a 100644 --- a/src/librustrt/unwind.rs +++ b/src/librustrt/unwind.rs @@ -384,7 +384,7 @@ pub mod eabi { #[lang = "begin_unwind"] pub extern fn rust_begin_unwind(msg: &fmt::Arguments, file: &'static str, line: uint) -> ! { - begin_unwind_fmt(msg, file, line) + begin_unwind_fmt(msg, &(file, line)) } /// The entry point for unwinding with a formatted message. @@ -394,8 +394,7 @@ pub extern fn rust_begin_unwind(msg: &fmt::Arguments, /// on (e.g.) the inlining of other functions as possible), by moving /// the actual formatting into this shared place. #[inline(never)] #[cold] -pub fn begin_unwind_fmt(msg: &fmt::Arguments, file: &'static str, - line: uint) -> ! { +pub fn begin_unwind_fmt(msg: &fmt::Arguments, file_line: &(&'static str, uint)) -> ! { use core::fmt::FormatWriter; // We do two allocations here, unfortunately. But (a) they're @@ -415,9 +414,10 @@ pub fn begin_unwind_fmt(msg: &fmt::Arguments, file: &'static str, let mut v = Vec::new(); let _ = write!(&mut VecWriter { v: &mut v }, "{}", msg); - begin_unwind_inner(box String::from_utf8(v).unwrap(), file, line) + begin_unwind_inner(box String::from_utf8(v).unwrap(), file_line) } +// FIXME: Need to change expr_fail in AstBuilder to change this to &(str, uint) /// This is the entry point of unwinding for fail!() and assert!(). #[inline(never)] #[cold] // avoid code bloat at the call sites as much as possible pub fn begin_unwind(msg: M, file: &'static str, line: uint) -> ! { @@ -429,13 +429,7 @@ pub fn begin_unwind(msg: M, file: &'static str, line: uint) -> ! // failing. // see below for why we do the `Any` coercion here. - begin_unwind_inner(box msg, file, line) -} - -/// Unwinding for `fail!()`. Saves passing a string. -#[inline(never)] #[cold] #[experimental] -pub fn begin_unwind_no_time_to_explain(file: &'static str, line: uint) -> ! { - begin_unwind_inner(box () ("explicit failure"), file, line) + begin_unwind_inner(box msg, &(file, line)) } /// The core of the unwinding. @@ -448,9 +442,7 @@ pub fn begin_unwind_no_time_to_explain(file: &'static str, line: uint) -> ! { /// Do this split took the LLVM IR line counts of `fn main() { fail!() /// }` from ~1900/3700 (-O/no opts) to 180/590. #[inline(never)] #[cold] // this is the slow path, please never inline this -fn begin_unwind_inner(msg: Box, - file: &'static str, - line: uint) -> ! { +fn begin_unwind_inner(msg: Box, file_line: &(&'static str, uint)) -> ! { // First, invoke call the user-defined callbacks triggered on task failure. // // By the time that we see a callback has been registered (by reading @@ -467,6 +459,7 @@ fn begin_unwind_inner(msg: Box, 0 => {} n => { let f: Callback = unsafe { mem::transmute(n) }; + let (file, line) = *file_line; f(msg, file, line); } } diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 3c6c860f516bb..f0732c7d508e8 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -38,12 +38,15 @@ /// ``` #[macro_export] macro_rules! fail( - () => ( - ::std::rt::begin_unwind_no_time_to_explain(file!(), line!()) - ); - ($msg:expr) => ( - ::std::rt::begin_unwind($msg, file!(), line!()) - ); + () => ({ + fail!("explicit failure") + }); + ($msg:expr) => ({ + // static requires less code at runtime, more constant data + static FILE_LINE: (&'static str, uint) = (file!(), line!()); + let (file, line) = FILE_LINE; + ::std::rt::begin_unwind($msg, file, line) + }); ($fmt:expr, $($arg:tt)*) => ({ // a closure can't have return type !, so we need a full // function to pass to format_args!, *and* we need the @@ -58,7 +61,8 @@ macro_rules! fail( // up with the number of calls to fail!() #[inline(always)] fn run_fmt(fmt: &::std::fmt::Arguments) -> ! { - ::std::rt::begin_unwind_fmt(fmt, file!(), line!()) + static FILE_LINE: (&'static str, uint) = (file!(), line!()); + ::std::rt::begin_unwind_fmt(fmt, &FILE_LINE) } format_args!(run_fmt, $fmt, $($arg)*) }); diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 023a30de027a9..4490977bde619 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -66,8 +66,7 @@ pub use self::util::{default_sched_threads, min_stack, running_on_valgrind}; // standard library which work together to create the entire runtime. pub use alloc::{heap, libc_heap}; pub use rustrt::{task, local, mutex, exclusive, stack, args, rtio, thread}; -pub use rustrt::{Stdio, Stdout, Stderr}; -pub use rustrt::{begin_unwind, begin_unwind_fmt, begin_unwind_no_time_to_explain}; +pub use rustrt::{Stdio, Stdout, Stderr, begin_unwind, begin_unwind_fmt}; pub use rustrt::{bookkeeping, at_exit, unwind, DEFAULT_ERROR_CODE, Runtime}; // Simple backtrace functionality (to print on failure)