mirror of
https://github.com/python/cpython.git
synced 2025-08-22 17:55:18 +00:00
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
This commit is contained in:
parent
99088ab081
commit
014223649c
58 changed files with 1295 additions and 1482 deletions
9
Python/executor_cases.c.h
generated
9
Python/executor_cases.c.h
generated
|
@ -5426,14 +5426,13 @@
|
|||
JUMP_TO_JUMP_TARGET();
|
||||
}
|
||||
// CPython promises to check all non-vectorcall function calls.
|
||||
if (tstate->c_recursion_remaining <= 0) {
|
||||
if (_Py_ReachedRecursionLimit(tstate)) {
|
||||
UOP_STAT_INC(uopcode, miss);
|
||||
JUMP_TO_JUMP_TARGET();
|
||||
}
|
||||
STAT_INC(CALL, hit);
|
||||
PyCFunction cfunc = PyCFunction_GET_FUNCTION(callable_o);
|
||||
_PyStackRef arg = args[0];
|
||||
_Py_EnterRecursiveCallTstateUnchecked(tstate);
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, PyCFunction_GET_SELF(callable_o), PyStackRef_AsPyObjectBorrow(arg));
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
|
@ -5813,7 +5812,7 @@
|
|||
JUMP_TO_JUMP_TARGET();
|
||||
}
|
||||
// CPython promises to check all non-vectorcall function calls.
|
||||
if (tstate->c_recursion_remaining <= 0) {
|
||||
if (_Py_ReachedRecursionLimit(tstate)) {
|
||||
UOP_STAT_INC(uopcode, miss);
|
||||
JUMP_TO_JUMP_TARGET();
|
||||
}
|
||||
|
@ -5826,7 +5825,6 @@
|
|||
}
|
||||
STAT_INC(CALL, hit);
|
||||
PyCFunction cfunc = meth->ml_meth;
|
||||
_Py_EnterRecursiveCallTstateUnchecked(tstate);
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc,
|
||||
PyStackRef_AsPyObjectBorrow(self_stackref),
|
||||
|
@ -5984,13 +5982,12 @@
|
|||
JUMP_TO_JUMP_TARGET();
|
||||
}
|
||||
// CPython promises to check all non-vectorcall function calls.
|
||||
if (tstate->c_recursion_remaining <= 0) {
|
||||
if (_Py_ReachedRecursionLimit(tstate)) {
|
||||
UOP_STAT_INC(uopcode, miss);
|
||||
JUMP_TO_JUMP_TARGET();
|
||||
}
|
||||
STAT_INC(CALL, hit);
|
||||
PyCFunction cfunc = meth->ml_meth;
|
||||
_Py_EnterRecursiveCallTstateUnchecked(tstate);
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
PyObject *res_o = _PyCFunction_TrampolineCall(cfunc, self, NULL);
|
||||
stack_pointer = _PyFrame_GetStackPointer(frame);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue