reduce diff further

Author: Fidget-Spinner

Include/internal/pycore_optimizer.h

@@ -375,4 +375,4 @@ void _PyJit_FinalizeTracing(PyThreadState *tstate);
 #ifdef __cplusplus
 }
 #endif
-#endif /* !Py_INTERNAL_OPTIMIZER_H */
+#endif /* !Py_INTERNAL_OPTIMIZER_H */

Include/internal/pycore_tstate.h

@@ -35,7 +35,7 @@ typedef struct _PyJitTracerInitialState {
 } _PyJitTracerInitialState;
 
 typedef struct _PyJitTracerPreviousState {
-    uint8_t dependencies_still_valid;
+    bool dependencies_still_valid;
     bool instr_is_super;
     int code_max_size;
     int code_curr_size;

Lib/test/test_capi/test_opt.py

@@ -128,7 +128,6 @@ def f():
         self.assertTrue(exe.is_valid())
         sys._clear_internal_caches()
         self.assertFalse(exe.is_valid())
-        gc.collect()
         exe = get_first_executor(f)
         self.assertIsNone(exe)
 

Python/bytecodes.c

@@ -3018,10 +3018,10 @@ dummy_func(
                 goto stop_tracing;
             }
             PyCodeObject *code = _PyFrame_GetCode(frame);
-
             _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
             assert(executor->vm_data.index == INSTR_OFFSET() - 1);
             assert(executor->vm_data.code == code);
+            assert(executor->vm_data.valid);
             assert(tstate->current_executor == NULL);
             /* If the eval breaker is set then stay in tier 1.
              * This avoids any potentially infinite loops

Python/gc_free_threading.c

@@ -10,7 +10,6 @@
 #include "pycore_interp.h"        // PyInterpreterState.gc
 #include "pycore_interpframe.h"   // _PyFrame_GetLocalsArray()
 #include "pycore_object_alloc.h"  // _PyObject_MallocWithType()
-#include "pycore_optimizer.h"
 #include "pycore_pystate.h"       // _PyThreadState_GET()
 #include "pycore_tstate.h"        // _PyThreadStateImpl
 #include "pycore_tuple.h"         // _PyTuple_MaybeUntrack()

Python/instrumentation.c

@@ -1928,9 +1928,7 @@ _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
 {
     int res;
     LOCK_CODE(code);
-    HEAD_LOCK(interp->runtime);
     res = instrument_lock_held(code, interp);
-    HEAD_UNLOCK(interp->runtime);
     UNLOCK_CODE();
     return res;
 }
@@ -2064,10 +2062,7 @@ _PyMonitoring_SetLocalEvents(PyCodeObject *code, int tool_id, _PyMonitoringEvent
     }
     set_local_events(local, tool_id, events);
 
-    HEAD_LOCK(interp->runtime);
-    int res = force_instrument_lock_held(code, interp);
-    HEAD_UNLOCK(interp->runtime);
-    return res;
+    return force_instrument_lock_held(code, interp);
 }
 
 int

Python/sysmodule.c

@@ -2365,7 +2365,7 @@ sys_activate_stack_trampoline_impl(PyObject *module, const char *backend)
 {
 #ifdef PY_HAVE_PERF_TRAMPOLINE
 #ifdef _Py_JIT
-    if (((_PyThreadStateImpl *)_PyThreadState_GET())->jit_executor_state.jit) {
+    if (FT_ATOMIC_LOAD_UINT8(_PyInterpreterState_GET()->jit)) {
         PyErr_SetString(PyExc_ValueError, "Cannot activate the perf trampoline if the JIT is active");
         return NULL;
     }