---

yaml
---
r: 15420
b: refs/heads/try
c: 596376e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: b42c6d07dc4b1aeb66901bd29b14ab34f9ef1183
+refs/heads/try: 596376ea55256ddea22afd2d854438c23075b592
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -512,19 +512,19 @@ rust_task::new_stack(size_t requested_sz) {
     size_t rust_stk_sz = get_next_stack_size(min_sz,
                                              current_sz, requested_sz);
 
-    if (total_stack_sz + rust_stk_sz > kernel->env->max_stack_size) {
+    size_t max_stack = kernel->env->max_stack_size;
+    size_t used_stack = total_stack_sz + rust_stk_sz;
+
+    // Don't allow stacks to grow forever. During unwinding we have to allow
+    // for more stack than normal in order to allow destructors room to run,
+    // arbitrarily selected as 2x the maximum stack size.
+    if (!unwinding && used_stack > max_stack) {
         LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this);
-        if (!unwinding) {
-            fail();
-        } else {
-            // FIXME: Because we have landing pads that may need more
-            // stack than normally allowed we have to go allow the stack
-            // to grow unbounded during unwinding. Would be nice to
-            // have a different solution - maybe just double the limit.
-            LOG_ERR(this, task, "task %" PRIxPTR " has blown its stack "
-                    "budget but we are unwinding so growing the stack "
-                    "anyway");
-        }
+        fail();
+    } else if (unwinding && used_stack > max_stack) {
+        LOG_ERR(this, task,
+                "task %" PRIxPTR " ran out of stack during unwinding", this);
+        fail();
     }
 
     size_t sz = rust_stk_sz + RED_ZONE_SIZE;

branches/try/src/test/run-fail/too-much-recursion-unwinding.rs

@@ -0,0 +1,23 @@
+// error-pattern:ran out of stack
+// xfail-test - right now we leak when we fail during failure
+
+// Test that the task fails after hiting the recursion limit
+// durnig unwinding
+
+fn recurse() {
+    log(debug, "don't optimize me out");
+    recurse();
+}
+
+resource r(recursed: *mut bool) unsafe {
+    if !*recursed {
+        *recursed = true;
+        recurse();
+    }
+}
+
+fn main() {
+    let mut recursed = false;
+    let _r = r(ptr::mut_addr_of(recursed));
+    recurse();
+}