cleanup

diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h
index 02da619522561053cf261db2d0b69ec2041bd2bc..33b9fd053f70cb8db80b5918114e386883343083 100644 (file)
--- a/Include/internal/pycore_ceval.h
+++ b/Include/internal/pycore_ceval.h
@@ -334,10 +334,9 @@ _PyEval_SpecialMethodCanSuggest(PyObject *self, int oparg);
 #define _PY_EVAL_PLEASE_STOP_BIT (1U << 5)
 #define _PY_EVAL_EXPLICIT_MERGE_BIT (1U << 6)
 #define _PY_EVAL_JIT_INVALIDATE_COLD_BIT (1U << 7)
-#define _PY_EVAL_JIT_DO_NOT_REENTER (1U << 8)
 
 /* Reserve a few bits for future use */
-#define _PY_EVAL_EVENTS_BITS 9
+#define _PY_EVAL_EVENTS_BITS 8
 #define _PY_EVAL_EVENTS_MASK ((1 << _PY_EVAL_EVENTS_BITS)-1)
 
 static inline void

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 318443daebc89cc9c606bf09fe2df7a1bb0b9a56..2e720d3fb300da16e2106173363f4ea2d7bc6a7b 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -3049,8 +3049,7 @@ dummy_func(
             /* If the eval breaker is set then stay in tier 1.
              * This avoids any potentially infinite loops
              * involving _RESUME_CHECK */
-            if (_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & (_PY_EVAL_EVENTS_MASK | _PY_EVAL_JIT_DO_NOT_REENTER)) {
-                _Py_unset_eval_breaker_bit(tstate, _PY_EVAL_JIT_DO_NOT_REENTER);
+            if (_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & _PY_EVAL_EVENTS_MASK) {
                 opcode = executor->vm_data.opcode;
                 oparg = (oparg & ~255) | executor->vm_data.oparg;
                 next_instr = this_instr;

diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
index e12040bcc848ecae49d84dbfe18c5e4feeebecb7..a8290242a5c1ef64715877d44f1808ef0a083125 100644 (file)
--- a/Python/ceval_macros.h
+++ b/Python/ceval_macros.h
@@ -401,10 +401,6 @@ do {                                                   \
         next_instr = frame->instr_ptr + 1;                 \
         JUMP_TO_LABEL(error);                          \
     }                                                  \
-    /* Progress made */ \
-    if (next_instr != this_instr) { \
-        _Py_unset_eval_breaker_bit(tstate, _PY_EVAL_JIT_DO_NOT_REENTER); \
-    } \
     if (keep_tracing_bit) { \
         assert(tstate->interp->jit_state.code_curr_size == 2 || tstate->interp->jit_state.code_curr_size == 3); \
         ENTER_TRACING(); \

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index c97a6a9dad8bb81072f83661fc3fa3be44216928..e500ec93fff4ce805266e94c0abe97b17ee2b63b 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -5509,8 +5509,7 @@
             assert(executor->vm_data.code == code);
             assert(executor->vm_data.valid);
             assert(tstate->current_executor == NULL);
-            if (_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & (_PY_EVAL_EVENTS_MASK | _PY_EVAL_JIT_DO_NOT_REENTER)) {
-                _Py_unset_eval_breaker_bit(tstate, _PY_EVAL_JIT_DO_NOT_REENTER);
+            if (_Py_atomic_load_uintptr_relaxed(&tstate->eval_breaker) & _PY_EVAL_EVENTS_MASK) {
                 opcode = executor->vm_data.opcode;
                 oparg = (oparg & ~255) | executor->vm_data.oparg;
                 next_instr = this_instr;