Don't potentially leak executor

DinoV · DinoV · commit 0b1ec196458f · 2024-04-02T11:48:51.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/Python/bytecodes.c b/Python/bytecodes.c
@@ -2391,6 +2391,12 @@ dummy_func(
         };
 
         tier1 inst(ENTER_EXECUTOR, (--)) {
+            CHECK_EVAL_BREAKER();
+            if (this_instr->op.code != ENTER_EXECUTOR) {
+                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);
@@ -2399,7 +2405,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
 
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) {
