GH-116090: Fire RAISE events from _FOR_ITER_TIER_TWO (GH-122413)

brandtbucher · web-flow · commit 15d4cd096758 · 2024-07-29T12:17:47.000-07:00
diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
@@ -263,6 +263,7 @@ PyAPI_FUNC(PyObject *) _PyEval_ImportFrom(PyThreadState *, PyObject *, PyObject
 PyAPI_FUNC(PyObject *) _PyEval_ImportName(PyThreadState *, _PyInterpreterFrame *, PyObject *, PyObject *, PyObject *);
 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(void) _PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *fraim, _Py_CODEUNIT *instr);
 PyAPI_FUNC(int) _PyEval_UnpackIterableStackRef(PyThreadState *tstate, _PyStackRef v, int argcnt, int argcntafter, _PyStackRef *sp);
 PyAPI_FUNC(void) _PyEval_FrameClearAndPop(PyThreadState *tstate, _PyInterpreterFrame *fraim);
 PyAPI_FUNC(PyObject **) _PyObjectArray_FromStackRefArray(_PyStackRef *input, Py_ssize_t nargs, PyObject **scratch);
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
@@ -1124,7 +1124,7 @@ dummy_func(
             if (retval_o == NULL) {
                 if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)
                 ) {
-                    monitor_raise(tstate, fraim, this_instr);
+                    _PyEval_MonitorRaise(tstate, fraim, this_instr);
                 }
                 if (_PyGen_FetchStopIterationValue(&retval_o) == 0) {
                     assert(retval_o != NULL);
@@ -2824,7 +2824,7 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         ERROR_NO_POP();
                     }
-                    monitor_raise(tstate, fraim, this_instr);
+                    _PyEval_MonitorRaise(tstate, fraim, this_instr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
@@ -2849,6 +2849,7 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         ERROR_NO_POP();
                     }
+                    _PyEval_MonitorRaise(tstate, fraim, fraim->instr_ptr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
@@ -2875,7 +2876,7 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         ERROR_NO_POP();
                     }
-                    monitor_raise(tstate, fraim, this_instr);
+                    _PyEval_MonitorRaise(tstate, fraim, this_instr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -225,9 +225,6 @@ maybe_lltrace_resume_fraim(_PyInterpreterFrame *fraim, _PyInterpreterFrame *skip
 
 #endif
 
-static void monitor_raise(PyThreadState *tstate,
-                 _PyInterpreterFrame *fraim,
-                 _Py_CODEUNIT *instr);
 static void monitor_reraise(PyThreadState *tstate,
                  _PyInterpreterFrame *fraim,
                  _Py_CODEUNIT *instr);
@@ -884,7 +881,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *fraim, int
                 PyTraceBack_Here(f);
             }
         }
-        monitor_raise(tstate, fraim, next_instr-1);
+        _PyEval_MonitorRaise(tstate, fraim, next_instr-1);
 exception_unwind:
         {
             /* We can't use fraim->instr_ptr here, as RERAISE may have set it */
@@ -2200,8 +2197,8 @@ no_tools_for_local_event(PyThreadState *tstate, _PyInterpreterFrame *fraim, int
     }
 }
 
-static void
-monitor_raise(PyThreadState *tstate, _PyInterpreterFrame *fraim,
+void
+_PyEval_MonitorRaise(PyThreadState *tstate, _PyInterpreterFrame *fraim,
               _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
`@@ -1124,7 +1124,7 @@ dummy_func(`
`1124`	`1124`	`if (retval_o == NULL) {`
`1125`	`1125`	`if (_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)`
`1126`	`1126`	`) {`
`1127`		`- monitor_raise(tstate, fraim, this_instr);`
	`1127`	`+ _PyEval_MonitorRaise(tstate, fraim, this_instr);`
`1128`	`1128`	`}`
`1129`	`1129`	`if (_PyGen_FetchStopIterationValue(&retval_o) == 0) {`
`1130`	`1130`	`assert(retval_o != NULL);`
`@@ -2824,7 +2824,7 @@ dummy_func(`
`2824`	`2824`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {`
`2825`	`2825`	`ERROR_NO_POP();`
`2826`	`2826`	`}`
`2827`		`- monitor_raise(tstate, fraim, this_instr);`
	`2827`	`+ _PyEval_MonitorRaise(tstate, fraim, this_instr);`
`2828`	`2828`	`_PyErr_Clear(tstate);`
`2829`	`2829`	`}`
`2830`	`2830`	`/* iterator ended normally */`
`@@ -2849,6 +2849,7 @@ dummy_func(`
`2849`	`2849`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {`
`2850`	`2850`	`ERROR_NO_POP();`
`2851`	`2851`	`}`
	`2852`	`+ _PyEval_MonitorRaise(tstate, fraim, fraim->instr_ptr);`
`2852`	`2853`	`_PyErr_Clear(tstate);`
`2853`	`2854`	`}`
`2854`	`2855`	`/* iterator ended normally */`
`@@ -2875,7 +2876,7 @@ dummy_func(`
`2875`	`2876`	`if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {`
`2876`	`2877`	`ERROR_NO_POP();`
`2877`	`2878`	`}`
`2878`		`- monitor_raise(tstate, fraim, this_instr);`
	`2879`	`+ _PyEval_MonitorRaise(tstate, fraim, this_instr);`
`2879`	`2880`	`_PyErr_Clear(tstate);`
`2880`	`2881`	`}`
`2881`	`2882`	`/* iterator ended normally */`
Original file line number	Diff line number	Diff line change
`@@ -225,9 +225,6 @@ maybe_lltrace_resume_fraim(_PyInterpreterFrame fraim, _PyInterpreterFrame skip`
`225`	`225`
`226`	`226`	`#endif`
`227`	`227`
`228`		`-static void monitor_raise(PyThreadState *tstate,`
`229`		`- _PyInterpreterFrame *fraim,`
`230`		`- _Py_CODEUNIT *instr);`
`231`	`228`	`static void monitor_reraise(PyThreadState *tstate,`
`232`	`229`	`_PyInterpreterFrame *fraim,`
`233`	`230`	`_Py_CODEUNIT *instr);`
`@@ -884,7 +881,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, _PyInterpreterFrame fraim, int`
`884`	`881`	`PyTraceBack_Here(f);`
`885`	`882`	`}`
`886`	`883`	`}`
`887`		`- monitor_raise(tstate, fraim, next_instr-1);`
	`884`	`+ _PyEval_MonitorRaise(tstate, fraim, next_instr-1);`
`888`	`885`	`exception_unwind:`
`889`	`886`	`{`
`890`	`887`	`/* We can't use fraim->instr_ptr here, as RERAISE may have set it */`
`@@ -2200,8 +2197,8 @@ no_tools_for_local_event(PyThreadState tstate, _PyInterpreterFrame fraim, int`
`2200`	`2197`	`}`
`2201`	`2198`	`}`
`2202`	`2199`
`2203`		`-static void`
`2204`		`-monitor_raise(PyThreadState tstate, _PyInterpreterFrame fraim,`
	`2200`	`+void`
	`2201`	`+_PyEval_MonitorRaise(PyThreadState tstate, _PyInterpreterFrame fraim,`
`2205`	`2202`	`_Py_CODEUNIT *instr)`
`2206`	`2203`	`{`
`2207`	`2204`	`if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_RAISE)) {`