Point to previous executor when side-exiting

Author: Fidget-Spinner

Include/internal/pycore_interp_structs.h

@@ -953,7 +953,7 @@ struct _is {
     int jit_tracer_initial_chain_depth;
     PyCodeObject *jit_tracer_initial_code; // Borrowed
     PyFunctionObject *jit_tracer_initial_func; // Borrowed
-    int jit_tracer_seen_initial_before;
+    struct _PyExitData *jit_tracer_previous_exit;
     bool jit_completed_loop;
     bool jit;
     bool compiling;

Include/internal/pycore_optimizer.h

@@ -371,7 +371,7 @@ _PyJIT_translate_single_bytecode_to_trace(
     int jump_taken);
 
 void
-_PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int curr_stackdepth, int chain_depth);
+_PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int curr_stackdepth, int chain_depth, _PyExitData *exit);
 #ifdef __cplusplus
 }
 #endif

Python/bytecodes.c

@@ -2978,7 +2978,7 @@ dummy_func(
                         DISPATCH();
                     }
                 }
-                _PyJIT_InitializeTracing(tstate, frame, next_instr, STACK_LEVEL(), 0);
+                _PyJIT_InitializeTracing(tstate, frame, next_instr, STACK_LEVEL(), 0, NULL);
                 ENTER_TRACING();
                 // Don't add the JUMP_BACKWARD_JIT instruction to the trace.
                 DISPATCH();
@@ -5456,7 +5456,7 @@ dummy_func(
                 _PyExecutorObject *previous_executor = _PyExecutor_FromExit(exit);
                 assert(tstate->current_executor == (PyObject *)previous_executor);
                 int chain_depth = is_dynamic ? 0 : current_executor->vm_data.chain_depth + 1;
-                _PyJIT_InitializeTracing(tstate, frame, target, STACK_LEVEL(), chain_depth);
+                _PyJIT_InitializeTracing(tstate, frame, target, STACK_LEVEL(), chain_depth, exit);
                 GOTO_TIER_ONE(target, 1);
             }
         }

Python/executor_cases.c.h

@@ -161,6 +161,11 @@ _PyOptimizer_Optimize(
     else {
         executor->vm_data.code = NULL;
     }
+    if (chain_depth > 0) {
+        _PyExitData *prev_exit = tstate->interp->jit_tracer_previous_exit;
+        assert(prev_exit != NULL);
+        prev_exit->executor = executor;;
+    }
     executor->vm_data.chain_depth = chain_depth;
     assert(executor->vm_data.valid);
     interp->compiling = false;
@@ -808,7 +813,7 @@ _PyJIT_translate_single_bytecode_to_trace(
 }
 
 void
-_PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int curr_stackdepth, int chain_depth)
+_PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_CODEUNIT *next_instr, int curr_stackdepth, int chain_depth, _PyExitData *exit)
 {
     PyCodeObject *code = _PyFrame_GetCode(frame);
 #ifdef Py_DEBUG
@@ -831,7 +836,7 @@ _PyJIT_InitializeTracing(PyThreadState *tstate, _PyInterpreterFrame *frame, _Py_
     tstate->interp->jit_tracer_initial_instr = next_instr;
     tstate->interp->jit_tracer_initial_code = code;
     tstate->interp->jit_tracer_initial_func = _PyFrame_GetFunction(frame);
-    tstate->interp->jit_tracer_seen_initial_before = 0;
+    tstate->interp->jit_tracer_previous_exit = exit;
     memset(&tstate->interp->jit_tracer_dependencies.bits, 0, sizeof(tstate->interp->jit_tracer_dependencies.bits));
     tstate->interp->jit_completed_loop = false;
     tstate->interp->jit_tracer_initial_stack_depth = curr_stackdepth;