Trace through BINARY_OP_SUBSCR_GETITEM

Author: Fidget-Spinner

Include/internal/pycore_optimizer.h

@@ -367,6 +367,7 @@ _PyJIT_translate_single_bytecode_to_trace(
     _Py_CODEUNIT *next_instr,
     PyCodeObject *code,
     PyFunctionObject *func,
+    int old_stack_level,
     int opcode,
     int oparg,
     int jump_taken);

Python/bytecodes.c

@@ -2985,6 +2985,7 @@ dummy_func(
                 int _jump_taken = false;
                 PyCodeObject *old_code = _PyFrame_GetCode(frame);
                 PyFunctionObject *old_func = (PyFunctionObject *)PyStackRef_AsPyObjectBorrow(frame->f_funcobj);
+                int _old_stack_level = 0;
                 TRACING_DISPATCH();
             }
             else {

Python/ceval.c

@@ -986,12 +986,12 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch)
 
 #if _Py_TIER2
 // 1 for trace full, 0 for successful write.
-static int
-add_to_code_trace(PyThreadState *tstate, _PyInterpreterFrame *frame, PyCodeObject *old_code, PyFunctionObject *old_func, _Py_CODEUNIT *this_instr, _Py_CODEUNIT *next_instr, int opcode, int oparg, int jump_taken)
+static inline int
+add_to_code_trace(PyThreadState *tstate, _PyInterpreterFrame *frame, PyCodeObject *old_code, PyFunctionObject *old_func, int old_stack_level, _Py_CODEUNIT *this_instr, _Py_CODEUNIT *next_instr, int opcode, int oparg, int jump_taken)
 {
     assert(frame != NULL);
     assert(tstate->interp->jit_state.jit_tracer_code_curr_size < UOP_MAX_TRACE_LENGTH);
-    return !_PyJIT_translate_single_bytecode_to_trace(tstate, frame, this_instr, next_instr, old_code, old_func, opcode, oparg, jump_taken);
+    return !_PyJIT_translate_single_bytecode_to_trace(tstate, frame, this_instr, next_instr, old_code, old_func, old_stack_level, opcode, oparg, jump_taken);
 }
 #endif
 

Python/ceval_macros.h

@@ -164,7 +164,7 @@
         if (_is_sys_tracing) { \
             LEAVE_TRACING(); \
         } \
-        else if ((IS_JIT_TRACING() && add_to_code_trace(tstate, frame, old_code, old_func, this_instr, next_instr, opcode, oparg, _jump_taken))) { \
+        else if ((IS_JIT_TRACING() && add_to_code_trace(tstate, frame, old_code, old_func, _old_stack_level, this_instr, next_instr, opcode, oparg, _jump_taken))) { \
             BAIL_TRACING_NO_DISPATCH(); \
         } \
     } while (0);