diff options
| author | Christian Heimes <christian@python.org> | 2022-06-27 14:19:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 14:19:47 (GMT) |
| commit | e5e51556e45ff70053b8a7f90a07ded966401911 (patch) | |
| tree | bd86bc0a068defa100285155119a4da07669c75f | |
| parent | c0453a40faaadb43d2e69767af6c9680f8689063 (diff) | |
| download | cpython-e5e51556e45ff70053b8a7f90a07ded966401911.zip cpython-e5e51556e45ff70053b8a7f90a07ded966401911.tar.gz cpython-e5e51556e45ff70053b8a7f90a07ded966401911.tar.bz2 | |
gh-90473: Reduce recursion limit on WASI even further (GH-94333)
750 fails sometimes with newer wasmtime versions. 600 is a more
conservative value.
| -rw-r--r-- | Include/internal/pycore_ceval.h | 7 | ||||
| -rw-r--r-- | Lib/test/test_tomllib/test_misc.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h index dafe31b..1b99930 100644 --- a/Include/internal/pycore_ceval.h +++ b/Include/internal/pycore_ceval.h @@ -12,11 +12,12 @@ extern "C" { struct pyruntimestate; struct _ceval_runtime_state; -/* WASI has limited call stack. wasmtime 0.36 can handle sufficient amount of - C stack frames for little more than 750 recursions. */ +/* WASI has limited call stack. Python's recursion limit depends on code + layout, optimization, and WASI runtime. Wasmtime can handle about 700-750 + recursions, sometimes less. 600 is a more conservative limit. */ #ifndef Py_DEFAULT_RECURSION_LIMIT # ifdef __wasi__ -# define Py_DEFAULT_RECURSION_LIMIT 750 +# define Py_DEFAULT_RECURSION_LIMIT 600 # else # define Py_DEFAULT_RECURSION_LIMIT 1000 # endif diff --git a/Lib/test/test_tomllib/test_misc.py b/Lib/test/test_tomllib/test_misc.py index 378db58..a477a21 100644 --- a/Lib/test/test_tomllib/test_misc.py +++ b/Lib/test/test_tomllib/test_misc.py @@ -92,8 +92,8 @@ class TestMiscellaneous(unittest.TestCase): self.assertEqual(obj_copy, expected_obj) def test_inline_array_recursion_limit(self): - # 470 with default recursion limit - nest_count = int(sys.getrecursionlimit() * 0.47) + # 465 with default recursion limit + nest_count = int(sys.getrecursionlimit() * 0.465) recursive_array_toml = "arr = " + nest_count * "[" + nest_count * "]" tomllib.loads(recursive_array_toml) |