Skip to content

Commit 2b6fa5b

Browse files
committed
---
yaml --- r: 55864 b: refs/heads/master c: 88dd53a h: refs/heads/master v: v3
1 parent 565d62f commit 2b6fa5b

File tree

7 files changed

+4
-87
lines changed

7 files changed

+4
-87
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 9f118865a207cb4a64aa3dac81ae74ba1f7bba69
2+
refs/heads/master: 88dd53a75441d25a060fb7dc7131ea3772383562
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
55
refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

trunk/src/rt/rust_env.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ get_max_stk_size() {
9797
return strtol(maxsz, NULL, 0);
9898
}
9999
else {
100-
return 1024*1024*8;
100+
return 1024*1024*1024;
101101
}
102102
}
103103

trunk/src/rt/rust_task.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,11 +530,11 @@ rust_task::new_stack(size_t requested_sz) {
530530
// arbitrarily selected as 2x the maximum stack size.
531531
if (!unwinding && used_stack > max_stack) {
532532
LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this);
533-
fail();
533+
abort();
534534
} else if (unwinding && used_stack > max_stack * 2) {
535535
LOG_ERR(this, task,
536536
"task %" PRIxPTR " ran out of stack during unwinding", this);
537-
fail();
537+
abort();
538538
}
539539

540540
size_t sz = rust_stk_sz + RED_ZONE_SIZE;

trunk/src/test/run-fail/issue-2144.rs

Lines changed: 0 additions & 19 deletions
This file was deleted.

trunk/src/test/run-fail/out-of-stack-managed-box.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

trunk/src/test/run-fail/out-of-stack-owned-box.rs

Lines changed: 0 additions & 21 deletions
This file was deleted.

trunk/src/test/run-fail/too-much-recursion.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)