reduce diff

Author: Fidget-Spinner

Include/internal/pycore_optimizer.h

@@ -24,11 +24,7 @@ typedef struct _PyExecutorLinkListNode {
 typedef struct {
     uint8_t opcode;
     uint8_t oparg;
-#ifdef Py_GIL_DISABLED
-    uint8_t valid;
-#else
     uint8_t valid:1;
-#endif
     uint8_t linked:1;
     uint8_t chain_depth:6;  // Must be big enough for MAX_CHAIN_DEPTH - 1.
     bool warm;

Include/internal/pycore_tstate.h

@@ -48,7 +48,6 @@ typedef struct _PyJitTracerPreviousState {
 } _PyJitTracerPreviousState;
 
 typedef struct _PyJitTracerState {
-    PyMutex lock;
     _PyUOpInstruction *code_buffer;
     _PyJitTracerInitialState initial_state;
     _PyJitTracerPreviousState prev_state;

Python/bytecodes.c

@@ -3020,19 +3020,9 @@ dummy_func(
             PyCodeObject *code = _PyFrame_GetCode(frame);
 
             _PyExecutorObject *executor = code->co_executors->executors[oparg & 255];
-            // We are responsible for cleaning up after ourselves.
-            if (!executor->vm_data.valid) {
-                opcode = executor->vm_data.opcode;
-                oparg = (oparg & ~255) | executor->vm_data.oparg;
-                next_instr = this_instr;
-                Py_BEGIN_CRITICAL_SECTION(code);
-                _Py_ExecutorDetach(executor);
-                Py_END_CRITICAL_SECTION();
-                DISPATCH_GOTO();
-            }
-            assert(tstate->current_executor == NULL);
             assert(executor->vm_data.index == INSTR_OFFSET() - 1);
             assert(executor->vm_data.code == code);
+            assert(tstate->current_executor == NULL);
             /* If the eval breaker is set then stay in tier 1.
              * This avoids any potentially infinite loops
              * involving _RESUME_CHECK */
@@ -3045,7 +3035,7 @@ dummy_func(
                 }
                 DISPATCH_GOTO();
             }
-            assert(executor != ((_PyThreadStateImpl *)tstate)->jit_executor_state.cold_executor);
+            assert(executor != tstate->interp->cold_executor);
             tstate->jit_exit = NULL;
             TIER1_TO_TIER2(executor);
             #else

Python/optimizer.c

@@ -941,15 +941,11 @@ _PyJit_TryInitializeTracing(
         return 0;
     }
 
-    if (!PyMutex_LockFast(&_tstate->jit_tracer_state.lock)) {
-        return 0;
-    }
 
     if (_tstate->jit_tracer_state.code_buffer == NULL) {
         _tstate->jit_tracer_state.code_buffer = (_PyUOpInstruction *)_PyObject_VirtualAlloc(UOP_BUFFER_SIZE);
         if (_tstate->jit_tracer_state.code_buffer == NULL) {
             // Don't error, just go to next instruction.
-            PyMutex_Unlock(&_tstate->jit_tracer_state.lock);
             return 0;
         }
     }
@@ -997,7 +993,6 @@ _PyJit_TryInitializeTracing(
         FT_ATOMIC_STORE_UINT16_RELAXED(close_loop_instr[1].counter.value_and_backoff, zero.value_and_backoff);
     }
     _Py_BloomFilter_Init(&_tstate->jit_tracer_state.prev_state.dependencies);
-    PyMutex_Unlock(&_tstate->jit_tracer_state.lock);
     return 1;
 }
 
@@ -1655,12 +1650,10 @@ jit_tracer_invalidate_dependency(PyThreadState *tstate, void *obj)
     _Py_BloomFilter_Init(&obj_filter);
     _Py_BloomFilter_Add(&obj_filter, obj);
     _PyThreadStateImpl *_tstate = (_PyThreadStateImpl *)tstate;
-    FT_MUTEX_LOCK(&_tstate->jit_tracer_state.lock);
     if (bloom_filter_may_contain(&_tstate->jit_tracer_state.prev_state.dependencies, &obj_filter))
     {
         FT_ATOMIC_STORE_UINT8(_tstate->jit_tracer_state.prev_state.dependencies_still_valid, 0);
-    }
-    FT_MUTEX_UNLOCK(&_tstate->jit_tracer_state.lock);
+    };
 }
 
 void