add back replaced, move jit tracing env var to

Author: Fidget-Spinner

Include/internal/pycore_interp_structs.h

@@ -944,6 +944,7 @@ struct _is {
     struct callable_cache callable_cache;
     PyObject *common_consts[NUM_COMMON_CONSTANTS];
     // JIT tracing state
+    bool jit_is_tracing;
     int jit_tracer_code_max_size;
     int jit_tracer_code_curr_size;
     _PyBloomFilter jit_tracer_dependencies;

Include/internal/pycore_opcode_metadata.h

@@ -3310,7 +3310,7 @@ dummy_func(
 #endif
         }
 
-        op(_ITER_NEXT_LIST, (iter, null_or_index -- iter, null_or_index, next)) {
+        replaced op(_ITER_NEXT_LIST, (iter, null_or_index -- iter, null_or_index, next)) {
             PyObject *list_o = PyStackRef_AsPyObjectBorrow(iter);
             assert(PyList_CheckExact(list_o));
 #ifdef Py_GIL_DISABLED

Include/internal/pycore_uop_metadata.h

@@ -136,9 +136,15 @@
     JUMP_TO_LABEL(label);
 
 #if _Py_TAIL_CALL_INTERP || USE_COMPUTED_GOTOS
-#  define IS_JIT_TRACING() (DISPATCH_TABLE_VAR == TRACING_DISPATCH_TABLE)
-#  define ENTER_TRACING() DISPATCH_TABLE_VAR = TRACING_DISPATCH_TABLE;
-#  define LEAVE_TRACING() DISPATCH_TABLE_VAR = DISPATCH_TABLE;
+#  define IS_JIT_TRACING() (tstate->interp->jit_is_tracing)
+#  define ENTER_TRACING() \
+    assert(!IS_JIT_TRACING()); \
+    DISPATCH_TABLE_VAR = TRACING_DISPATCH_TABLE; \
+    tstate->interp->jit_is_tracing = true;
+#  define LEAVE_TRACING() \
+    assert(IS_JIT_TRACING()); \
+    DISPATCH_TABLE_VAR = DISPATCH_TABLE; \
+    tstate->interp->jit_is_tracing = false;
 #  define BAIL_TRACING_NO_DISPATCH() \
     LEAVE_TRACING(); \
     _PyFrame_SetStackPointer(frame, stack_pointer); \
@@ -148,14 +154,6 @@
     if (_err < 0) { \
         JUMP_TO_LABEL(error); \
     }
-#  define BAIL_TRACING() \
-    BAIL_TRACING_NO_DISPATCH() \
-    DISPATCH();
-#  define RECORD_TRACE() do { \
-        if (add_to_code_trace(tstate, frame, old_code, old_func, this_instr, next_instr, opcode, oparg, _jump_taken)) { \
-            BAIL_TRACING(); \
-        } \
-    } while (0);
 #  define RECORD_TRACE_NO_DISPATCH() do { \
         if (add_to_code_trace(tstate, frame, old_code, old_func, this_instr, next_instr, opcode, oparg, _jump_taken)) { \
             BAIL_TRACING_NO_DISPATCH(); \
@@ -224,7 +222,7 @@ do { \
 #define TRACING_DISPATCH() \
     { \
         assert(frame->stackpointer == NULL); \
-        RECORD_TRACE(); \
+        RECORD_TRACE_NO_DISPATCH(); \
         NEXTOPARG(); \
         PRE_DISPATCH_GOTO(); \
         DISPATCH_GOTO(); \
@@ -414,7 +412,6 @@ _PyFrame_SetStackPointer(frame, stack_pointer)
 
 #define TIER1_TO_TIER2(EXECUTOR)                        \
 do {                                                   \
-    LEAVE_TRACING(); \
     OPT_STAT_INC(traces_executed);                     \
     next_instr = _Py_jit_entry((EXECUTOR), frame, stack_pointer, tstate); \
     frame = tstate->current_frame;                     \