diff options
| author | bors <bors@rust-lang.org> | 2014-07-22 10:46:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-22 10:46:16 +0000 |
| commit | bfcde309e7748dfdf33418c2a1e6c6bdfbdcc8e2 (patch) | |
| tree | b28fdbafa95391edfa1a2f358e79e8ec5bbb620a /src/libstd | |
| parent | 62f1bb047bdbb02b08e4e50a9716af2da6799241 (diff) | |
| parent | c61f9763e2e03afbe62445877ceb3ed15e22e123 (diff) | |
| download | rust-bfcde309e7748dfdf33418c2a1e6c6bdfbdcc8e2.tar.gz rust-bfcde309e7748dfdf33418c2a1e6c6bdfbdcc8e2.zip | |
auto merge of #15876 : brson/rust/failfat, r=pcwalton
Adds a new runtime unwinding function that encapsulates the printing of the words "explicit failure" when `fail!()` is called w/o arguments.
The before/after optimized assembly:
```
leaq "str\"str\"(1412)"(%rip), %rax
movq %rax, 24(%rsp)
movq $16, 32(%rsp)
leaq "str\"str\"(1413)"(%rip), %rax
movq %rax, 8(%rsp)
movq $19, 16(%rsp)
leaq 24(%rsp), %rdi
leaq 8(%rsp), %rsi
movl $11, %edx
callq _ZN6unwind12begin_unwind21h15836560661922107792E
```
```
leaq "str\"str\"(1369)"(%rip), %rax
movq %rax, 8(%rsp)
movq $19, 16(%rsp)
leaq 8(%rsp), %rdi
movl $11, %esi
callq _ZN6unwind31begin_unwind_no_time_to_explain20hd1c720cdde6a116480dE@PLT
```
Before/after filesizes:
rwxrwxr-x 1 brian brian 21479503 Jul 20 22:09 stage2-old/lib/librustc-4e7c5e5c.so
rwxrwxr-x 1 brian brian 21475415 Jul 20 22:30 x86_64-unknown-linux-gnu/stage2/lib/librustc-4e7c5e5c.so
This is the lowest-hanging fruit in the fail-bloat wars. Further fixes are going to require harder tradeoffs.
r? @pcwalton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index 8b79af8c931..3c6c860f516 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -39,7 +39,7 @@ #[macro_export] macro_rules! fail( () => ( - fail!("explicit failure") + ::std::rt::begin_unwind_no_time_to_explain(file!(), line!()) ); ($msg:expr) => ( ::std::rt::begin_unwind($msg, file!(), line!()) diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 4490977bde6..023a30de027 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -66,7 +66,8 @@ 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, begin_unwind, begin_unwind_fmt}; +pub use rustrt::{Stdio, Stdout, Stderr}; +pub use rustrt::{begin_unwind, begin_unwind_fmt, begin_unwind_no_time_to_explain}; pub use rustrt::{bookkeeping, at_exit, unwind, DEFAULT_ERROR_CODE, Runtime}; // Simple backtrace functionality (to print on failure) |