Skip to content

Commit 883dfc6

Browse files
authored
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.
1 parent be6dbfb commit 883dfc6

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
@@ -9542,12 +9542,6 @@ then
95429542
# -u libsys_s pulls in all symbols in libsys
95439543
Darwin/*)
95449544
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
9545-
9546-
# Issue #18075: the default maximum stack size (8MBytes) is too
9547-
# small for the default recursion limit. Increase the stack size
9548-
# to ensure that tests don't crash
9549-
LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
9550-
95519545
if test "$enable_framework"
95529546
then
95539547
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2701,12 +2701,6 @@ then
27012701
# -u libsys_s pulls in all symbols in libsys
27022702
Darwin/*)
27032703
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
2704-
2705-
# Issue #18075: the default maximum stack size (8MBytes) is too
2706-
# small for the default recursion limit. Increase the stack size
2707-
# to ensure that tests don't crash
2708-
LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
2709-
27102704
if test "$enable_framework"
27112705
then
27122706
LINKFORSHARED="$LINKFORSHARED "'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'

0 commit comments

Comments
 (0)