mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[3.13] GH-116090: Fire RAISE events from _FOR_ITER_TIER_TWO (GH-122419) 

(cherry picked from commit 15d4cd0967)
This commit is contained in:
Brandt Bucher 2024-07-29 14:51:19 -07:00 committed by GitHub
parent 56340ee8b1
commit 55554fd215
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/internal/pycore_ceval.h
View File

@ -255,6 +255,7 @@ PyAPI_FUNC(void) _PyEval_FormatKwargsError(PyThreadState *tstate, PyObject *func
PyAPI_FUNC(PyObject *)_PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type, Py_ssize_t nargs, PyObject *kwargs); PyAPI_FUNC(PyObject *)_PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type, Py_ssize_t nargs, PyObject *kwargs);
PyAPI_FUNC(PyObject *)_PyEval_MatchKeys(PyThreadState *tstate, PyObject *map, PyObject *keys); PyAPI_FUNC(PyObject *)_PyEval_MatchKeys(PyThreadState *tstate, PyObject *map, PyObject *keys);
PyAPI_FUNC(int) _PyEval_UnpackIterable(PyThreadState *tstate, PyObject *v, int argcnt, int argcntafter, PyObject **sp); PyAPI_FUNC(int) _PyEval_UnpackIterable(PyThreadState *tstate, PyObject *v, int argcnt, int argcntafter, PyObject **sp);
PyAPI_FUNC(void) _PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *instr);
PyAPI_FUNC(void) _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame); PyAPI_FUNC(void) _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *frame);

2
Misc/NEWS.d/next/Core_and_Builtins/2024-07-29-10-55-46.gh-issue-116090.p1MhU0.rst Normal file
View File

@ -0,0 +1,2 @@
Fix an issue in JIT builds that prevented some :keyword:`for` loops from
correctly firing :monitoring-event:`RAISE` monitoring events.

7
Python/bytecodes.c
View File

@ -1037,7 +1037,7 @@ dummy_func(
if (retval == NULL) { if (retval == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration) if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)
) { ) {
monitor_raise(tstate, frame, this_instr); _PyEval_MonitorRaise(tstate, frame, this_instr);
} }
if (_PyGen_FetchStopIterationValue(&retval) == 0) { if (_PyGen_FetchStopIterationValue(&retval) == 0) {
assert(retval != NULL); assert(retval != NULL);
@ -2603,7 +2603,7 @@ dummy_func(
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) { if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
ERROR_NO_POP(); ERROR_NO_POP();
} }
monitor_raise(tstate, frame, this_instr); _PyEval_MonitorRaise(tstate, frame, this_instr);
_PyErr_Clear(tstate); _PyErr_Clear(tstate);
} }
/* iterator ended normally */ /* iterator ended normally */
@ -2626,6 +2626,7 @@ dummy_func(
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) { if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
ERROR_NO_POP(); ERROR_NO_POP();
} }
_PyEval_MonitorRaise(tstate, frame, frame->instr_ptr);
_PyErr_Clear(tstate); _PyErr_Clear(tstate);
} }
/* iterator ended normally */ /* iterator ended normally */
@ -2650,7 +2651,7 @@ dummy_func(
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) { if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
ERROR_NO_POP(); ERROR_NO_POP();
} }
monitor_raise(tstate, frame, this_instr); _PyEval_MonitorRaise(tstate, frame, this_instr);
_PyErr_Clear(tstate); _PyErr_Clear(tstate);
} }
/* iterator ended normally */ /* iterator ended normally */

9
Python/ceval.c
View File

@ -223,9 +223,6 @@ maybe_lltrace_resume_frame(_PyInterpreterFrame *frame, _PyInterpreterFrame *skip
#endif #endif
static void monitor_raise(PyThreadState *tstate,
_PyInterpreterFrame *frame,
_Py_CODEUNIT *instr);
static void monitor_reraise(PyThreadState *tstate, static void monitor_reraise(PyThreadState *tstate,
_PyInterpreterFrame *frame, _PyInterpreterFrame *frame,
_Py_CODEUNIT *instr); _Py_CODEUNIT *instr);
@ -873,7 +870,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
PyTraceBack_Here(f); PyTraceBack_Here(f);
} }
} }
monitor_raise(tstate, frame, next_instr-1); _PyEval_MonitorRaise(tstate, frame, next_instr-1);
exception_unwind: exception_unwind:
{ {
/* We can't use frame->instr_ptr here, as RERAISE may have set it */ /* We can't use frame->instr_ptr here, as RERAISE may have set it */
@ -2184,8 +2181,8 @@ no_tools_for_local_event(PyThreadState *tstate, _PyInterpreterFrame *frame, int
} }
} }
static void void
monitor_raise(PyThreadState *tstate, _PyInterpreterFrame *frame, _PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *frame,
_Py_CODEUNIT *instr) _Py_CODEUNIT *instr)
{ {
if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_RAISE)) { if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_RAISE)) {

1
Python/executor_cases.c.h generated
View File

@ -2635,6 +2635,7 @@
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) { if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
JUMP_TO_ERROR(); JUMP_TO_ERROR();
} }
_PyEval_MonitorRaise(tstate, frame, frame->instr_ptr);
_PyErr_Clear(tstate); _PyErr_Clear(tstate);
} }
/* iterator ended normally */ /* iterator ended normally */

6
Python/generated_cases.c.h generated
View File

@ -2787,7 +2787,7 @@
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) { if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
goto error; goto error;
} }
monitor_raise(tstate, frame, this_instr); _PyEval_MonitorRaise(tstate, frame, this_instr);
_PyErr_Clear(tstate); _PyErr_Clear(tstate);
} }
/* iterator ended normally */ /* iterator ended normally */
@ -3307,7 +3307,7 @@
if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) { if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
goto error; goto error;
} }
monitor_raise(tstate, frame, this_instr); _PyEval_MonitorRaise(tstate, frame, this_instr);
_PyErr_Clear(tstate); _PyErr_Clear(tstate);
} }
/* iterator ended normally */ /* iterator ended normally */
@ -5317,7 +5317,7 @@
if (retval == NULL) { if (retval == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration) if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)
) { ) {
monitor_raise(tstate, frame, this_instr); _PyEval_MonitorRaise(tstate, frame, this_instr);
} }
if (_PyGen_FetchStopIterationValue(&retval) == 0) { if (_PyGen_FetchStopIterationValue(&retval) == 0) {
assert(retval != NULL); assert(retval != NULL);