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

brandtbucher · web-flow · commit 55554fd2157c · 2024-07-29T14:51:19.000-07:00
(cherry picked from commit 15d4cd0)
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -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_MatchKeys(PyThreadState *tstate, PyObject *map, PyObject *keys);
 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);
 
 
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2024-07-29-10-55-46.gh-issue-116090.p1MhU0.rst b/Misc/NEWS.d/next/Core_and_Builtins/2024-07-29-10-55-46.gh-issue-116090.p1MhU0.rst
@@ -0,0 +1,2 @@
+Fix an issue in JIT builds that prevented some :keyword:`for` loops from
+correctly firing :monitoring-event:`RAISE` monitoring events.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1037,7 +1037,7 @@ dummy_func(
             if (retval == NULL) {
                 if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)
                 ) {
-                    monitor_raise(tstate, frame, this_instr);
+                    _PyEval_MonitorRaise(tstate, frame, this_instr);
                 }
                 if (_PyGen_FetchStopIterationValue(&retval) == 0) {
                     assert(retval != NULL);
@@ -2603,7 +2603,7 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         ERROR_NO_POP();
                     }
-                    monitor_raise(tstate, frame, this_instr);
+                    _PyEval_MonitorRaise(tstate, frame, this_instr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
@@ -2626,6 +2626,7 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         ERROR_NO_POP();
                     }
+                    _PyEval_MonitorRaise(tstate, frame, frame->instr_ptr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
@@ -2650,7 +2651,7 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         ERROR_NO_POP();
                     }
-                    monitor_raise(tstate, frame, this_instr);
+                    _PyEval_MonitorRaise(tstate, frame, this_instr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -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 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
                 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)) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix an issue in JIT builds that prevented some :keyword:`for` loops from
	`2`	+correctly firing :monitoring-event:`RAISE` monitoring events.
Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@ dummy_func(`
`1037`	`1037`	`if (retval == NULL) {`
`1038`	`1038`	`if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)`
`1039`	`1039`	`) {`
`1040`		`- monitor_raise(tstate, frame, this_instr);`
	`1040`	`+ _PyEval_MonitorRaise(tstate, frame, this_instr);`
`1041`	`1041`	`}`
`1042`	`1042`	`if (_PyGen_FetchStopIterationValue(&retval) == 0) {`
`1043`	`1043`	`assert(retval != NULL);`
`@@ -2603,7 +2603,7 @@ dummy_func(`
`2603`	`2603`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {`
`2604`	`2604`	`ERROR_NO_POP();`
`2605`	`2605`	`}`
`2606`		`- monitor_raise(tstate, frame, this_instr);`
	`2606`	`+ _PyEval_MonitorRaise(tstate, frame, this_instr);`
`2607`	`2607`	`_PyErr_Clear(tstate);`
`2608`	`2608`	`}`
`2609`	`2609`	`/* iterator ended normally */`
`@@ -2626,6 +2626,7 @@ dummy_func(`
`2626`	`2626`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {`
`2627`	`2627`	`ERROR_NO_POP();`
`2628`	`2628`	`}`
	`2629`	`+ _PyEval_MonitorRaise(tstate, frame, frame->instr_ptr);`
`2629`	`2630`	`_PyErr_Clear(tstate);`
`2630`	`2631`	`}`
`2631`	`2632`	`/* iterator ended normally */`
`@@ -2650,7 +2651,7 @@ dummy_func(`
`2650`	`2651`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {`
`2651`	`2652`	`ERROR_NO_POP();`
`2652`	`2653`	`}`
`2653`		`- monitor_raise(tstate, frame, this_instr);`
	`2654`	`+ _PyEval_MonitorRaise(tstate, frame, this_instr);`
`2654`	`2655`	`_PyErr_Clear(tstate);`
`2655`	`2656`	`}`
`2656`	`2657`	`/* iterator ended normally */`
Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,6 @@ maybe_lltrace_resume_frame(_PyInterpreterFrame frame, _PyInterpreterFrame skip`
`223`	`223`
`224`	`224`	`#endif`
`225`	`225`
`226`		`-static void monitor_raise(PyThreadState *tstate,`
`227`		`- _PyInterpreterFrame *frame,`
`228`		`- _Py_CODEUNIT *instr);`
`229`	`226`	`static void monitor_reraise(PyThreadState *tstate,`
`230`	`227`	`_PyInterpreterFrame *frame,`
`231`	`228`	`_Py_CODEUNIT *instr);`
`@@ -873,7 +870,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame frame, int`
`873`	`870`	`PyTraceBack_Here(f);`
`874`	`871`	`}`
`875`	`872`	`}`
`876`		`- monitor_raise(tstate, frame, next_instr-1);`
	`873`	`+ _PyEval_MonitorRaise(tstate, frame, next_instr-1);`
`877`	`874`	`exception_unwind:`
`878`	`875`	`{`
`879`	`876`	`/* 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`
`2184`	`2181`	`}`
`2185`	`2182`	`}`
`2186`	`2183`
`2187`		`-static void`
`2188`		`-monitor_raise(PyThreadState tstate, _PyInterpreterFrame frame,`
	`2184`	`+void`
	`2185`	`+_PyEval_MonitorRaise(PyThreadState tstate, _PyInterpreterFrame frame,`
`2189`	`2186`	`_Py_CODEUNIT *instr)`
`2190`	`2187`	`{`
`2191`	`2188`	`if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_RAISE)) {`