Skip to content

Commit 52a5b71

Browse files
bpo-34602: Avoid failures setting macOS stack resource limit (GH-13011)
Under some conditions the earlier fix for bpo-18075, "Infinite recursion tests triggering a segfault on Mac OS X", now causes failures on macOS when attempting to change stack limit with resource.setrlimit resource.RLIMIT_STACK, like regrtest does when running the test suite. The reverted change had specified a non-default stack size when linking the python executable on macOS. As of macOS 10.14.4, the previous code causes a hard failure when running tests, although similar failures had been seen under some conditions under some earlier systems. For now, revert the original change and resume using the default stack size when linking the interpreter. (cherry picked from commit 883dfc6) Co-authored-by: Ned Deily <[email protected]>
1 parent 5e09a99 commit 52a5b71

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Avoid failures setting macOS stack resource limit with resource.setrlimit.
2+
This reverts an earlier fix for bpo-18075 which forced a non-default stack
3+
size when building the interpreter executable on macOS.

configure

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9541,12 +9541,6 @@ then
95419541
# -u libsys_s pulls in all symbols in libsys
95429542
Darwin/*)
95439543
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
9544-
9545-
# Issue #18075: the default maximum stack size (8MBytes) is too
9546-
# small for the default recursion limit. Increase the stack size
9547-
# to ensure that tests don't crash
9548-
LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
9549-
95509544
if test "$enable_framework"
95519545
then
95529546
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2708,12 +2708,6 @@ then
27082708
# -u libsys_s pulls in all symbols in libsys
27092709
Darwin/*)
27102710
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
2711-
2712-
# Issue #18075: the default maximum stack size (8MBytes) is too
2713-
# small for the default recursion limit. Increase the stack size
2714-
# to ensure that tests don't crash
2715-
LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
2716-
27172711
if test "$enable_framework"
27182712
then
27192713
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

0 commit comments

Comments
 (0)