https://github.com/python/cpython/commit/0c26dbd16e9dd71a52d3ebd43d692f0cd88a3a37 commit: 0c26dbd16e9dd71a52d3ebd43d692f0cd88a3a37 branch: main author: Petr Viktorin <encu...@gmail.com> committer: encukou <encu...@gmail.com> date: 2025-04-29T12:56:20+02:00 summary:
gh-133079: Remove Py_C_RECURSION_LIMIT & PyThreadState.c_recursion_remaining (GH-133080) Both were added in 3.13, are undocumented, and don't make sense in 3.14 due to changes in the stack overflow detection machinery (gh-112282). PEP 387 exception for skipping a deprecation period: https://github.com/python/steering-council/issues/288 files: A Misc/NEWS.d/next/C_API/2025-04-28-13-27-48.gh-issue-133079.DJL2sK.rst M Doc/whatsnew/3.14.rst M Include/cpython/pystate.h M Python/pystate.c M Python/vm-state.md diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst index 9b28d7b6247309..646a0b4007fc05 100644 --- a/Doc/whatsnew/3.14.rst +++ b/Doc/whatsnew/3.14.rst @@ -2280,3 +2280,10 @@ Removed * Remove the private ``_Py_InitializeMain()`` function. It was a :term:`provisional API` added to Python 3.8 by :pep:`587`. (Contributed by Victor Stinner in :gh:`129033`.) + +* The undocumented APIs :c:macro:`!Py_C_RECURSION_LIMIT` and + :c:member:`!PyThreadState.c_recursion_remaining`, added in 3.13, are removed + without a deprecation period. + Please use :c:func:`Py_EnterRecursiveCall` to guard against runaway recursion + in C code. + (Removed in :gh:`133079`, see also :gh:`130396`.) diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h index 97f11fff244a8b..97c097aa01c508 100644 --- a/Include/cpython/pystate.h +++ b/Include/cpython/pystate.h @@ -118,8 +118,6 @@ struct _ts { int py_recursion_remaining; int py_recursion_limit; - - int c_recursion_remaining; /* Retained for backwards compatibility. Do not use */ int recursion_headroom; /* Allow 50 more calls to handle any errors. */ /* 'tracing' keeps track of the execution depth when tracing/profiling. @@ -210,8 +208,6 @@ struct _ts { _PyRemoteDebuggerSupport remote_debugger_support; }; -# define Py_C_RECURSION_LIMIT 5000 - /* other API */ /* Similar to PyThreadState_Get(), but don't issue a fatal error diff --git a/Misc/NEWS.d/next/C_API/2025-04-28-13-27-48.gh-issue-133079.DJL2sK.rst b/Misc/NEWS.d/next/C_API/2025-04-28-13-27-48.gh-issue-133079.DJL2sK.rst new file mode 100644 index 00000000000000..436324528611b9 --- /dev/null +++ b/Misc/NEWS.d/next/C_API/2025-04-28-13-27-48.gh-issue-133079.DJL2sK.rst @@ -0,0 +1,3 @@ +The undocumented APIs :c:macro:`!Py_C_RECURSION_LIMIT` and +:c:member:`!PyThreadState.c_recursion_remaining`, added in 3.13, are removed +without a deprecation period. diff --git a/Python/pystate.c b/Python/pystate.c index ec19e3ae6a415a..8c0bab3f2b48f8 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -1559,7 +1559,6 @@ init_threadstate(_PyThreadStateImpl *_tstate, tstate->py_recursion_limit = interp->ceval.recursion_limit; tstate->py_recursion_remaining = interp->ceval.recursion_limit; - tstate->c_recursion_remaining = 2; tstate->exc_info = &tstate->exc_state; // PyGILState_Release must not try to delete this thread state. diff --git a/Python/vm-state.md b/Python/vm-state.md index b3246557dbeea3..83b6a577f29e95 100644 --- a/Python/vm-state.md +++ b/Python/vm-state.md @@ -73,7 +73,8 @@ It will be more complex in the JIT. Another important piece of VM state is the **thread state**, held in `tstate`. The current frame pointer, `frame`, is always equal to `tstate->current_frame`. -The thread state also holds the exception state (`tstate->exc_info`) and the recursion counters (`tstate->c_recursion_remaining` and `tstate->py_recursion_remaining`). +The thread state also holds the exception state (`tstate->exc_info`) and +recursion tracking data (`tstate->py_recursion_remaining`, `tstate->c_stack*`). The thread state is also used to access the **interpreter state** (`tstate->interp`), which is important since the "eval breaker" flags are stored there (`tstate->interp->ceval.eval_breaker`, an "atomic" variable), as well as the "PEP 523 function" (`tstate->interp->eval_frame`). The interpreter state also holds the optimizer state (`optimizer` and some counters). _______________________________________________ Python-checkins mailing list -- python-checkins@python.org To unsubscribe send an email to python-checkins-le...@python.org https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: arch...@mail-archive.com
