rt: Set the stack depth limit to 1GB. Abort on error.

People hit the recursion depth limit too often, it's not possible to unwind reliably from out-of-stack. Issues #3555, #3695
rust-lang · Apr 26, 2013 · 149047e · 149047e · bors · Apr 27, 2013
1 parent 64412ec
commit 149047e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 86 deletions.
diff --git a/src/rt/rust_env.cpp b/src/rt/rust_env.cpp
@@ -97,7 +97,7 @@ get_max_stk_size() {
         return strtol(maxsz, NULL, 0);
     }
     else {
-        return 1024*1024*8;
+        return 1024*1024*1024;
     }
 }
 

diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
@@ -530,11 +530,11 @@ rust_task::new_stack(size_t requested_sz) {
     // 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);
-        fail();
+        abort();
     } else if (unwinding && used_stack > max_stack * 2) {
         LOG_ERR(this, task,
                 "task %" PRIxPTR " ran out of stack during unwinding", this);
-        fail();
+        abort();
     }
 
     size_t sz = rust_stk_sz + RED_ZONE_SIZE;

diff --git a/src/test/run-fail/issue-2144.rs b/src/test/run-fail/issue-2144.rs
diff --git a/src/test/run-fail/out-of-stack-managed-box.rs b/src/test/run-fail/out-of-stack-managed-box.rs
diff --git a/src/test/run-fail/out-of-stack-owned-box.rs b/src/test/run-fail/out-of-stack-owned-box.rs
diff --git a/src/test/run-fail/too-much-recursion.rs b/src/test/run-fail/too-much-recursion.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ get_max_stk_size() { @@
             return strtol(maxsz, NULL, 0);
         }
         else {
-            return 1024*1024*8;
+            return 1024*1024*1024;
         }
     }
@@ Expand Down @@