---

yaml
---
r: 15419
b: refs/heads/try
c: b42c6d0
h: refs/heads/master
i:
  15417: 1d0cfed
  15415: 636e3ec
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: a1d59704ed12282e7f00c137e03538bc397fc8e3
+refs/heads/try: b42c6d07dc4b1aeb66901bd29b14ab34f9ef1183
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_task.cpp

@@ -514,7 +514,17 @@ rust_task::new_stack(size_t requested_sz) {
 
     if (total_stack_sz + rust_stk_sz > kernel->env->max_stack_size) {
         LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this);
-        fail();
+        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");
+        }
     }
 
     size_t sz = rust_stk_sz + RED_ZONE_SIZE;

branches/try/src/test/run-fail/issue-2144.rs

@@ -0,0 +1,9 @@
+// error-pattern:ran out of stack
+
+// Don't leak when the landing pads need to request more stack
+// than is allowed during normal execution
+
+fn useBlock(f: fn~() -> uint) { useBlock({|| 22u }) }
+fn main() {
+    useBlock({|| 22u });
+}