Skip to content

Commit 1dc7e71

Browse files
committed
---
yaml --- r: 56475 b: refs/heads/auto c: 88dd53a h: refs/heads/master i: 56473: 7b3b257 56471: 44547a1 v: v3
1 parent ddccf0f commit 1dc7e71

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
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 9f118865a207cb4a64aa3dac81ae74ba1f7bba69
17+
refs/heads/auto: 88dd53a75441d25a060fb7dc7131ea3772383562
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/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/auto/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/auto/src/test/run-fail/issue-2144.rs

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)