pythongh-111798: Use lower Py_C_RECURSION_LIMIT in debug mode

Reenable test_call.test_super_deep() on s390x architecture.
vstinner · Nov 15, 2023 · 35e985e · 35e985e
1 parent e5dfcc2
commit 35e985e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
@@ -214,7 +214,11 @@ struct _ts {
 
 };
 
-#ifdef __wasi__
+#ifdef Py_DEBUG
+   // A debug build is likely built with low optimization level which implies
+   // higher stack memory usage than a release build. Use a lower limit.
+#  define Py_C_RECURSION_LIMIT 500
+#elif defined(__wasi__)
    // WASI has limited call stack. Python's recursion limit depends on code
    // layout, optimization, and WASI runtime. Wasmtime can handle about 700
    // recursions, sometimes less. 500 is a more conservative limit.

diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
@@ -1,5 +1,5 @@
 import unittest
-from test.support import cpython_only, requires_limited_api, skip_on_s390x
+from test.support import cpython_only, requires_limited_api
 try:
     import _testcapi
 except ImportError:
@@ -989,7 +989,6 @@ def case_change_over_substitution(BLuch=None, Luch = None, fluch = None):
 @cpython_only
 class TestRecursion(unittest.TestCase):
 
-    @skip_on_s390x
     def test_super_deep(self):
 
         def recurse(n):

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-15-20-20-51.gh-issue-111798.cs-3t3.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-15-20-20-51.gh-issue-111798.cs-3t3.rst
@@ -0,0 +1,4 @@
+When Python is built in debug mode, set the C recursion limit to 500 instead
+of 1500. A debug build is likely built with low optimization level which
+implies higher stack memory usage than a release build. Patch by Victor
+Stinner.