[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

View file

@ -223,9 +223,6 @@ maybe_lltrace_resume_frame(_PyInterpreterFrame *frame, _PyInterpreterFrame *skip
#endif
static void monitor_raise(PyThreadState *tstate,
_PyInterpreterFrame *frame,
_Py_CODEUNIT *instr);
static void monitor_reraise(PyThreadState *tstate,
_PyInterpreterFrame *frame,
_Py_CODEUNIT *instr);
@ -873,7 +870,7 @@ error:
PyTraceBack_Here(f);
}
}
monitor_raise(tstate, frame, next_instr-1);
_PyEval_MonitorRaise(tstate, frame, next_instr-1);
exception_unwind:
{
/* 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
monitor_raise(PyThreadState *tstate, _PyInterpreterFrame *frame,
void
_PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *frame,
_Py_CODEUNIT *instr)
{
if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_RAISE)) {