Skip to content

Commit fbe2a13

Browse files
bpo-34602: Avoid failures setting macOS stack resource limit (GH-13011) (GH-13014)
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 4508bc3 commit fbe2a13

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
@@ -9504,12 +9504,6 @@ then
95049504
# -u libsys_s pulls in all symbols in libsys
95059505
Darwin/*)
95069506
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
9507-
9508-
# Issue #18075: the default maximum stack size (8MBytes) is too
9509-
# small for the default recursion limit. Increase the stack size
9510-
# to ensure that tests don't crash
9511-
LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
9512-
95139507
if test "$enable_framework"
95149508
then
95159509
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2697,12 +2697,6 @@ then
26972697
# -u libsys_s pulls in all symbols in libsys
26982698
Darwin/*)
26992699
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
2700-
2701-
# Issue #18075: the default maximum stack size (8MBytes) is too
2702-
# small for the default recursion limit. Increase the stack size
2703-
# to ensure that tests don't crash
2704-
LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
2705-
27062700
if test "$enable_framework"
27072701
then
27082702
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

0 commit comments

Comments
 (0)