auto merge of #11360 : huonw/rust/stack_bounds, r=alexcrichton

We just approximate with a 2MB stack for native::start.

2 files changed, 7 insertions, 6 deletions

diff --git a/src/libgreen/simple.rs b/src/libgreen/simple.rs
index ddacc11fd9e..4a0523fe47a 100644
--- a/src/libgreen/simple.rs
+++ b/src/libgreen/simple.rs
@@ -75,7 +75,7 @@ impl Runtime for SimpleTask {
         fail!()
     }
     fn local_io<'a>(&'a mut self) -> Option<rtio::LocalIo<'a>> { None }
-    fn stack_bounds(&self) -> Option<(uint, uint)> { None }
+    fn stack_bounds(&self) -> (uint, uint) { fail!() }
     fn wrap(~self) -> ~Any { fail!() }
 }
 
diff --git a/src/libgreen/task.rs b/src/libgreen/task.rs
index 62c9ad12535..31752941231 100644
--- a/src/libgreen/task.rs
+++ b/src/libgreen/task.rs
@@ -454,11 +454,12 @@ impl Runtime for GreenTask {
         }
     }
 
-    fn stack_bounds(&self) -> Option<(uint, uint)> {
-        self.coroutine.as_ref().map(|c| {
-            (c.current_stack_segment.start() as uint,
-             c.current_stack_segment.end() as uint)
-        })
+    fn stack_bounds(&self) -> (uint, uint) {
+        let c = self.coroutine.as_ref()
+            .expect("GreenTask.stack_bounds called without a coroutine");
+
+        (c.current_stack_segment.start() as uint,
+         c.current_stack_segment.end() as uint)
     }
 
     fn wrap(~self) -> ~Any { self as ~Any }