diff options
| author | bors <bors@rust-lang.org> | 2013-11-11 10:46:28 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-11 10:46:28 -0800 |
| commit | 0966ec01dcb0ff90e6d483706820794ef8e16c2e (patch) | |
| tree | 7d2032464a17a0ecb160828be5197587a545752d /src/libstd/rt/task.rs | |
| parent | 4d9b95fada7c97ac1c63099bab1d45ba120958ec (diff) | |
| parent | 1f192430956704ddf263aba0cfb5b8856c547beb (diff) | |
| download | rust-0966ec01dcb0ff90e6d483706820794ef8e16c2e.tar.gz rust-0966ec01dcb0ff90e6d483706820794ef8e16c2e.zip | |
auto merge of #10407 : alexcrichton/rust/no-fixed-stack-segment, r=brson
The commit messages have more details, but this removes all analysis and usage related to fixed_stack_segment and rust_stack attributes. It's now the assumption that we always have "enough stack" and we'll implement detection of stack overflow through other means. The stack overflow detection is currently implemented for rust functions, but it is unimplemented for C functions (we still don't have guard pages).
Diffstat (limited to 'src/libstd/rt/task.rs')
| -rw-r--r-- | src/libstd/rt/task.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 7e374fc6021..7620a4371c1 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -509,7 +509,6 @@ impl Unwinder { } extern { - #[rust_stack] fn rust_try(f: extern "C" fn(*c_void, *c_void), code: *c_void, data: *c_void) -> uintptr_t; @@ -517,8 +516,6 @@ impl Unwinder { } pub fn begin_unwind(&mut self, cause: ~Any) -> ! { - #[fixed_stack_segment]; #[inline(never)]; - self.unwinding = true; self.cause = Some(cause); unsafe { @@ -537,9 +534,8 @@ impl Unwinder { /// truly consider it to be stack overflow rather than allocating a new stack. #[no_mangle] // - this is called from C code #[no_split_stack] // - it would be sad for this function to trigger __morestack -#[doc(hidden)] // XXX: this function shouldn't have to be `pub` to get exported - // so it can be linked against, we should have a better way - // of specifying that. +#[doc(hidden)] // - Function must be `pub` to get exported, but it's + // irrelevant for documentation purposes. pub extern "C" fn rust_stack_exhausted() { use rt::in_green_task_context; use rt::task::Task; |
