break local == instrumented assumption

Author: P403n1x87

Include/cpython/monitoring.h

@@ -22,12 +22,14 @@ extern "C" {
 #define PY_MONITORING_EVENT_BRANCH_LEFT 8
 #define PY_MONITORING_EVENT_BRANCH_RIGHT 9
 #define PY_MONITORING_EVENT_STOP_ITERATION 10
-#define PY_MONITORING_EVENT_PY_UNWIND 11
 
-// TODO: PY_UNWIND requires no instrumentation so this definition is not
-// entirely correct.
 #define PY_MONITORING_IS_INSTRUMENTED_EVENT(ev) \
-((ev) <= _PY_MONITORING_LOCAL_EVENTS)
+((ev) <= PY_MONITORING_EVENT_STOP_ITERATION)
+
+#define PY_MONITORING_EVENT_PY_UNWIND 11
+
+#define PY_MONITORING_IS_LOCAL_EVENT(ev) \
+((ev) < _PY_MONITORING_LOCAL_EVENTS)
 
 
 /* Other events, mainly exceptions */

Python/ceval.c

@@ -2616,9 +2616,7 @@ monitor_unwind(PyThreadState *tstate,
                _Py_CODEUNIT *instr)
 {
     if (no_tools_for_local_event(tstate, frame, PY_MONITORING_EVENT_PY_UNWIND)) {
-        if (no_tools_for_global_event(tstate, PY_MONITORING_EVENT_PY_UNWIND)) {
-            return;
-        }
+        return;
     }
     do_monitor_exc(tstate, frame, instr, PY_MONITORING_EVENT_PY_UNWIND);
 }

Python/instrumentation.c

@@ -1102,7 +1102,7 @@ get_tools_for_instruction(PyCodeObject *code, PyInterpreterState *interp, int i,
                 event == PY_MONITORING_EVENT_C_RETURN);
         event = PY_MONITORING_EVENT_CALL;
     }
-    if (PY_MONITORING_IS_INSTRUMENTED_EVENT(event)) {
+    if (PY_MONITORING_IS_LOCAL_EVENT(event)) {
         CHECK(debug_check_sanity(interp, code));
         if (code->_co_monitoring->tools) {
             tools = code->_co_monitoring->tools[i];