Clean up the diff

python · brandtbucher · May 5, 2025 · May 1, 2025 · May 1, 2025 · May 1, 2025
commit c5104b89e6650b038ab9851c51d679fb09b57bda
diff --git a/Include/cpython/pystate.h b/Include/cpython/pystate.h
@@ -206,10 +206,6 @@ struct _ts {
     */
     PyObject *threading_local_sentinel;
     _PyRemoteDebuggerSupport remote_debugger_support;
-
-    // Any frame between the topmost frame where the JIT is currently active,
-    // and the interpreter entry frame below it (used by sys._jit.is_active):
-    struct _PyInterpreterFrame *jit_entry;
 };
 
 /* other API */

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1202,9 +1202,6 @@ dummy_func(
             LOAD_IP(frame->return_offset);
             res = temp;
             LLTRACE_RESUME_FRAME();
-        #if TIER_TWO
-            tstate->jit_entry = frame;
-        #endif
         }
 
         tier1 op(_RETURN_VALUE_EVENT, (val -- val)) {
@@ -1391,9 +1388,6 @@ dummy_func(
             LOAD_IP(1 + INLINE_CACHE_ENTRIES_SEND);
             value = PyStackRef_MakeHeapSafe(temp);
             LLTRACE_RESUME_FRAME();
-        #if TIER_TWO
-            tstate->jit_entry = frame;
-        #endif
         }
 
         tier1 op(_YIELD_VALUE_EVENT, (val -- val)) {
@@ -4983,9 +4977,6 @@ dummy_func(
             RELOAD_STACK();
             res = PyStackRef_FromPyObjectStealMortal((PyObject *)gen);
             LLTRACE_RESUME_FRAME();
-        #if TIER_TWO
-            tstate->jit_entry = frame;
-        #endif
         }
 
         inst(BUILD_SLICE, (args[oparg] -- slice)) {

diff --git a/Python/ceval.c b/Python/ceval.c
@@ -1096,7 +1096,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int
     /* Tier 2 interpreter state */
     _PyExecutorObject *current_executor = NULL;
     const _PyUOpInstruction *next_uop = NULL;
-    _PyInterpreterFrame *jit_entry;
 #endif
 #if Py_TAIL_CALL_INTERP
 #   if Py_STATS

diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -381,8 +381,6 @@ do { \
     tstate->current_executor = (PyObject *)_executor; \
     next_uop = _executor->trace; \
     assert(next_uop->opcode == _START_EXECUTOR); \
-    jit_entry = tstate->jit_entry; \
-    tstate->jit_entry = frame; \
     goto enter_tier_two; \
 } while (0)
 #endif

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -1588,8 +1588,6 @@ init_threadstate(_PyThreadStateImpl *_tstate,
 
     tstate->delete_later = NULL;
 
-    tstate->jit_entry = NULL;
-
     llist_init(&_tstate->mem_free_queue);
     llist_init(&_tstate->asyncio_tasks_head);
     if (interp->stoptheworld.requested || _PyRuntime.stoptheworld.requested) {