Skip to content

Commit 599a904

Browse files
committed
---
yaml --- r: 57831 b: refs/heads/incoming c: 88dd53a h: refs/heads/master i: 57829: 093911b 57827: cd7ba56 57823: ac25a9a v: v3
1 parent 35b47a4 commit 599a904

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
@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 9f118865a207cb4a64aa3dac81ae74ba1f7bba69
9+
refs/heads/incoming: 88dd53a75441d25a060fb7dc7131ea3772383562
1010
refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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

branches/incoming/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;

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)