diff options
| author | Mark Shannon <mark@hotpy.org> | 2025-02-25 09:24:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-25 09:24:48 (GMT) |
| commit | 014223649c33b2febbccfa221c2ab7f18a8c0847 (patch) | |
| tree | 5fb6432982ab3085d9275f20769f8fbcc581666b /Python/bytecodes.c | |
| parent | 99088ab081279329b8362e1c24533fa0be303e6f (diff) | |
| download | cpython-014223649c33b2febbccfa221c2ab7f18a8c0847.zip cpython-014223649c33b2febbccfa221c2ab7f18a8c0847.tar.gz cpython-014223649c33b2febbccfa221c2ab7f18a8c0847.tar.bz2 | |
GH-130396: Use computed stack limits on linux (GH-130398)
* Implement C recursion protection with limit pointers for Linux, MacOS and Windows
* Remove calls to PyOS_CheckStack
* Add stack protection to parser
* Make tests more robust to low stacks
* Improve error messages for stack overflow
Diffstat (limited to 'Python/bytecodes.c')
| -rw-r--r-- | Python/bytecodes.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 1c5fdf8..3c5cb07 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1082,7 +1082,6 @@ dummy_func( /* Restore previous frame and return. */ tstate->current_frame = frame->previous; assert(!_PyErr_Occurred(tstate)); - tstate->c_recursion_remaining += PY_EVAL_C_STACK_UNITS; PyObject *result = PyStackRef_AsPyObjectSteal(retval); SYNC_SP(); /* Not strictly necessary, but prevents warnings */ return result; @@ -3971,11 +3970,10 @@ dummy_func( EXIT_IF(!PyCFunction_CheckExact(callable_o)); EXIT_IF(PyCFunction_GET_FLAGS(callable_o) != METH_O); // CPython promises to check all non-vectorcall function calls. - EXIT_IF(tstate->c_recursion_remaining <= 0); + EXIT_IF(_Py_ReachedRecursionLimit(tstate)); STAT_INC(CALL, hit); PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable_o); _PyStackRef arg = args[0]; - _Py_EnterRecursiveCallTstateUnchecked(tstate); PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable_o), PyStackRef_AsPyObjectBorrow(arg)); _Py_LeaveRecursiveCallTstate(tstate); assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL)); @@ -4165,14 +4163,13 @@ dummy_func( PyMethodDef *meth = method->d_method; EXIT_IF(meth->ml_flags != METH_O); // CPython promises to check all non-vectorcall function calls. - EXIT_IF(tstate->c_recursion_remaining <= 0); + EXIT_IF(_Py_ReachedRecursionLimit(tstate)); _PyStackRef arg_stackref = arguments[1]; _PyStackRef self_stackref = arguments[0]; EXIT_IF(!Py_IS_TYPE(PyStackRef_AsPyObjectBorrow(self_stackref), method->d_common.d_type)); STAT_INC(CALL, hit); PyCFunction cfunc = meth->ml_meth; - _Py_EnterRecursiveCallTstateUnchecked(tstate); PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, PyStackRef_AsPyObjectBorrow(self_stackref), PyStackRef_AsPyObjectBorrow(arg_stackref)); @@ -4247,10 +4244,9 @@ dummy_func( EXIT_IF(!Py_IS_TYPE(self, method->d_common.d_type)); EXIT_IF(meth->ml_flags != METH_NOARGS); // CPython promises to check all non-vectorcall function calls. - EXIT_IF(tstate->c_recursion_remaining <= 0); + EXIT_IF(_Py_ReachedRecursionLimit(tstate)); STAT_INC(CALL, hit); PyCFunction cfunc = meth->ml_meth; - _Py_EnterRecursiveCallTstateUnchecked(tstate); PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, self, NULL); _Py_LeaveRecursiveCallTstate(tstate); assert((res_o != NULL) ^ (_PyErr_Occurred(tstate) != NULL)); @@ -5252,7 +5248,6 @@ dummy_func( if (frame->owner == FRAME_OWNED_BY_INTERPRETER) { /* Restore previous frame and exit */ tstate->current_frame = frame->previous; - tstate->c_recursion_remaining += PY_EVAL_C_STACK_UNITS; return NULL; } next_instr = frame->instr_ptr; |