Don't potentially leak executor

DinoV · DinoV · commit 9f2d6b91f20b · 2024-04-02T15:56:09.000-07:00
diff --git a/Include/cpython/pyatomic_msc.h b/Include/cpython/pyatomic_msc.h
@@ -922,7 +922,7 @@ _Py_atomic_load_uintptr_acquire(const uintptr_t *obj)
 #elif defined(_M_ARM64)
     return (uintptr_t)__ldar64((unsigned __int64 volatile *)obj);
 #else
-#  error "no implementation of _Py_atomic_load_ptr_acquire"
+#  error "no implementation of _Py_atomic_load_uintptr_acquire"
 #endif
 }
 
@@ -947,7 +947,7 @@ _Py_atomic_store_uintptr_release(uintptr_t *obj, uintptr_t value)
     _Py_atomic_ASSERT_ARG_TYPE(unsigned __int64);
     __stlr64((unsigned __int64 volatile *)obj, (unsigned __int64)value);
 #else
-#  error "no implementation of _Py_atomic_store_int_release"
+#  error "no implementation of _Py_atomic_store_uintptr_release"
 #endif
 }
 
diff --git a/Include/internal/pycore_pyatomic_ft_wrappers.h b/Include/internal/pycore_pyatomic_ft_wrappers.h
@@ -37,6 +37,9 @@ extern "C" {
     _Py_atomic_store_ssize_relaxed(&value, new_value)
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) \
     _Py_atomic_store_uint8_relaxed(&value, new_value)
+#define FT_ATOMIC_EXCHANGE_PYOBJECT(value, new_value)   \
+    _Py_atomic_exchange_ptr(&value, new_value)
+
 #else
 #define FT_ATOMIC_LOAD_SSIZE(value) value
 #define FT_ATOMIC_LOAD_SSIZE_RELAXED(value) value
@@ -47,6 +50,16 @@ extern "C" {
 #define FT_ATOMIC_STORE_UINTPTR_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_SSIZE_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) value = new_value
+#define FT_ATOMIC_EXCHANGE_PYOBJECT(value, new_value)   \
+    _atomic_exchange_pyobject_withgil(&value, new_value)
+
+static inline PyObject *
+_atomic_exchange_pyobject_withgil(PyObject **src, PyObject *new_value)
+{
+    PyObject *res = *src;
+    *src = new_value;
+    return res;
+}
 
 #endif
 
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -2392,6 +2392,14 @@ dummy_func(
         };
 
         tier1 inst(ENTER_EXECUTOR, (--)) {
+            int prevoparg = oparg;
+            CHECK_EVAL_BREAKER();
+            if (this_instr->op.code != ENTER_EXECUTOR ||
+                this_instr->op.arg != prevoparg) {
+                next_instr = this_instr;
+                DISPATCH();
+            }
+
             PyCodeObject *code = _PyFrame_GetCode(frame);
             _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
             assert(executor->vm_data.index == INSTR_OFFSET() - 1);
@@ -2400,7 +2408,6 @@ dummy_func(
             assert(tstate->previous_executor == NULL);
             tstate->previous_executor = Py_None;
             Py_INCREF(executor);
-            CHECK_EVAL_BREAKER();
             GOTO_TIER_TWO(executor);
         }
 
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
@@ -42,7 +42,7 @@
     assert(!_PyInterpreterState_GET()->stoptheworld.world_stopped); \
     Py_BEGIN_CRITICAL_SECTION(code)
 
-#define UNLOCK_CODE(code)   Py_END_CRITICAL_SECTION()
+#define UNLOCK_CODE()   Py_END_CRITICAL_SECTION()
 
 #else
 
@@ -1374,15 +1374,10 @@ _PyMonitoring_RegisterCallback(int tool_id, int event_id, PyObject *obj)
     PyInterpreterState *is = _PyInterpreterState_GET();
     assert(0 <= tool_id && tool_id < PY_MONITORING_TOOL_IDS);
     assert(0 <= event_id && event_id < _PY_MONITORING_EVENTS);
-#ifdef Py_GIL_DISABLED
-    PyObject *callback = _Py_atomic_exchange_ptr(
-        &is->monitoring_callables[tool_id][event_id],
+    PyObject *callback = FT_ATOMIC_EXCHANGE_PYOBJECT(is->monitoring_callables[tool_id][event_id],
         Py_XNewRef(obj)
     );
-#else
-    PyObject *callback = is->monitoring_callables[tool_id][event_id];
-    is->monitoring_callables[tool_id][event_id] = Py_XNewRef(obj);
-#endif
+
     return callback;
 }
 
diff --git a/Python/legacy_tracing.c b/Python/legacy_tracing.c
@@ -586,7 +586,7 @@ _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg)
     // needs to be decref'd outside of the lock
     PyObject *old_traceobj;
     LOCK_SETUP();
-    int tracing_threads = setup_tracing(tstate, func, arg, &old_traceobj);
+    Py_ssize_t tracing_threads = setup_tracing(tstate, func, arg, &old_traceobj);
     UNLOCK_SETUP();
     Py_XDECREF(old_traceobj);
     if (tracing_threads < 0) {
diff --git a/Tools/jit/template.c b/Tools/jit/template.c
@@ -11,6 +11,7 @@
 #include "pycore_opcode_metadata.h"
 #include "pycore_opcode_utils.h"
 #include "pycore_optimizer.h"
+#include "pycore_pyatomic_ft_wrappers.h"
 #include "pycore_range.h"
 #include "pycore_setobject.h"
 #include "pycore_sliceobject.h"
