about summary refs log tree commit diff
path: root/src/libstd/sys.rs
diff options
context:
space:
mode:
authorErick Tryzelaar <erick.tryzelaar@gmail.com>2013-08-06 16:18:58 -0700
committerErick Tryzelaar <erick.tryzelaar@gmail.com>2013-08-06 16:18:58 -0700
commit8567611adfa69c4488133e18d3ec4fc195afadd1 (patch)
tree80e325db23f407d643e2ada480de23b1fb8b4fc6 /src/libstd/sys.rs
parentfb9b27910b41e714dfd6b3ccc48161260943c9cf (diff)
parentd89ff7eef969aee6b493bc846b64d68358fafbcd (diff)
Merge commit 'd89ff7eef969aee6b493bc846b64d68358fafbcd' into remove-str-trailing-nulls
Diffstat (limited to 'src/libstd/sys.rs')
-rw-r--r--src/libstd/sys.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstd/sys.rs b/src/libstd/sys.rs
index b40f87617a9..83ee4cf07c6 100644
--- a/src/libstd/sys.rs
+++ b/src/libstd/sys.rs
@@ -14,7 +14,6 @@
 
 use c_str::ToCStr;
 use cast;
-use gc;
 use io;
 use libc;
 use libc::{c_char, size_t};
@@ -147,7 +146,6 @@ pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! {
     match context {
         OldTaskContext => {
             unsafe {
-                gc::cleanup_stack_for_failure();
                 rustrt::rust_upcall_fail(msg, file, line);
                 cast::transmute(())
             }
@@ -180,8 +178,6 @@ pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! {
                              msg, file, line as int);
                 }
 
-                gc::cleanup_stack_for_failure();
-
                 let task = Local::unsafe_borrow::<Task>();
                 if (*task).unwinder.unwinding {
                     rtabort!("unwinding again");