reduce diff

Author: Fidget-Spinner

Include/internal/pycore_optimizer.h

@@ -358,6 +358,8 @@ _PyJit_TryInitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame,
 
 void _PyJit_FinalizeTracing(PyThreadState *tstate);
 
+void _PyJit_Tracer_InvalidateDependency(PyThreadState *old_tstate, void *obj);
+
 #ifdef __cplusplus
 }
 #endif

Modules/_testinternalcapi.c

@@ -1240,7 +1240,8 @@ add_executor_dependency(PyObject *self, PyObject *args)
 static PyObject *
 invalidate_executors(PyObject *self, PyObject *obj)
 {
-    _Py_Executors_InvalidateDependency(_PyInterpreterState_GET(), obj, 1);
+    PyInterpreterState *interp = PyInterpreterState_Get();
+    _Py_Executors_InvalidateDependency(interp, obj, 1);
     Py_RETURN_NONE;
 }
 

Objects/codeobject.c

@@ -2432,6 +2432,7 @@ code_dealloc(PyObject *self)
         PyMem_Free(co_extra);
     }
 #ifdef _Py_TIER2
+    _PyJit_Tracer_InvalidateDependency(tstate, self);
     _Py_Executors_InvalidateDependency(tstate->interp, self, 1);
     if (co->co_executors != NULL) {
         clear_executors(co);

Objects/frameobject.c

@@ -262,6 +262,7 @@ framelocalsproxy_setitem(PyObject *self, PyObject *key, PyObject *value)
 
 #if _Py_TIER2
         _Py_Executors_InvalidateDependency(_PyInterpreterState_GET(), co, 1);
+        _PyJit_Tracer_InvalidateDependency(_PyThreadState_GET(), co);
 #endif
 
         _PyLocals_Kind kind = _PyLocals_GetKind(co->co_localspluskinds, i);

Objects/funcobject.c

@@ -11,7 +11,7 @@
 #include "pycore_setobject.h"     // _PySet_NextEntry()
 #include "pycore_stats.h"
 #include "pycore_weakref.h"       // FT_CLEAR_WEAKREFS()
-#include "pycore_optimizer.h"     // _Py_Executors_InvalidateDependency
+#include "pycore_optimizer.h"     // _PyJit_Tracer_InvalidateDependency
 
 static const char *
 func_event_name(PyFunction_WatchEvent event) {
@@ -1166,6 +1166,7 @@ func_dealloc(PyObject *self)
     }
 #if _Py_TIER2
     _Py_Executors_InvalidateDependency(_PyInterpreterState_GET(), self, 1);
+    _PyJit_Tracer_InvalidateDependency(_PyThreadState_GET(), self);
 #endif
     _PyObject_GC_UNTRACK(op);
     FT_CLEAR_WEAKREFS(self, op->func_weakreflist);

Objects/typeobject.c

@@ -1177,7 +1177,6 @@ set_version_unlocked(PyTypeObject *tp, unsigned int version)
             + (version % TYPE_VERSION_CACHE_SIZE);
         *slot = tp;
     }
-    END_TYPE_LOCK();
 #endif
 }
 

Python/ceval.c

@@ -1716,7 +1716,7 @@ _PyTier2Interpreter(
     for (;;) {
         uopcode = next_uop->opcode;
 #ifdef Py_DEBUG
-        if (frame->lltrace >= 4) {
+        if (frame->lltrace >= 3) {
             dump_stack(frame, stack_pointer);
             printf("    cache=[");
             dump_cache_item(_tos_cache0, 0, current_cached_values);

Python/instrumentation.c

@@ -1785,6 +1785,7 @@ force_instrument_lock_held(PyCodeObject *code, PyInterpreterState *interp)
         _PyCode_Clear_Executors(code);
     }
     _Py_Executors_InvalidateDependency(interp, code, 1);
+    _PyJit_Tracer_InvalidateDependency(PyThreadState_GET(), code);
 #endif
     int code_len = (int)Py_SIZE(code);
     /* Exit early to avoid creating instrumentation

Python/optimizer.c

@@ -1786,8 +1786,6 @@ _Py_Executor_DependsOn(_PyExecutorObject *executor, void *obj)
     _Py_BloomFilter_Add(&executor->vm_data.bloom, obj);
 }
 
-static void  jit_tracer_invalidate_dependency(PyThreadState *tstate, void *obj);
-
 /* Invalidate all executors that depend on `obj`
  * May cause other executors to be invalidated as well
  */
@@ -1798,7 +1796,7 @@ _Py_Executors_InvalidateDependency(PyInterpreterState *interp, void *obj, int is
     // It doesn't matter if we don't invalidate all threads.
     // If more threads are spawned, we force the jit not to compile anyways
     // so the trace gets abandoned.
-    jit_tracer_invalidate_dependency(_PyThreadState_GET(), obj);
+    _PyJit_Tracer_InvalidateDependency(_PyThreadState_GET(), obj);
 
     _PyBloomFilter obj_filter;
     _Py_BloomFilter_Init(&obj_filter);
@@ -1838,7 +1836,7 @@ _Py_Executors_InvalidateDependency(PyInterpreterState *interp, void *obj, int is
 }
 
 static void
-jit_tracer_invalidate_dependency(PyThreadState *tstate, void *obj)
+_PyJit_Tracer_InvalidateDependency(PyThreadState *tstate, void *obj)
 {
     _PyBloomFilter obj_filter;
     _Py_BloomFilter_Init(&obj_filter);
@@ -2046,4 +2044,4 @@ _PyExecutor_Free(struct _PyExecutorObject *self)
     Py_UNREACHABLE();
 }
 
-#endif /* _Py_TIER2 */
+#endif /* _Py_TIER2 */