diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-06-22 01:09:06 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-06-24 17:07:03 -0700 |
| commit | 5e7c5d6c3d532e7b536b76044cd47b72b8eadaad (patch) | |
| tree | 4293df31a4276cc3d477ece661fe30debc7da63a /src/libstd/sys.rs | |
| parent | a09972db3545344048b90e90d1f1821b621a38b9 (diff) | |
| download | rust-5e7c5d6c3d532e7b536b76044cd47b72b8eadaad.tar.gz rust-5e7c5d6c3d532e7b536b76044cd47b72b8eadaad.zip | |
std: Make box annihilator work with newsched
Diffstat (limited to 'src/libstd/sys.rs')
| -rw-r--r-- | src/libstd/sys.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/sys.rs b/src/libstd/sys.rs index 8ac60ffb979..523c5d633cf 100644 --- a/src/libstd/sys.rs +++ b/src/libstd/sys.rs @@ -216,12 +216,15 @@ pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! { task.logger.log(Left(outmsg.take())); } } else { - rtdebug!("%s", outmsg); + rterrln!("%s", outmsg); } gc::cleanup_stack_for_failure(); let task = Local::unsafe_borrow::<Task>(); + if (*task).unwinder.unwinding { + rtabort!("unwinding again"); + } (*task).unwinder.begin_unwind(); } } |