Add #ifdefs for debug-jit as well

Author: markshannon

Python/bytecodes.c

@@ -5349,9 +5349,9 @@ dummy_func(
         tier2 op(_START_EXECUTOR, (executor/4 --)) {
 #ifndef _Py_JIT
             current_executor = (_PyExecutorObject*)executor;
-#endif
 #ifdef Py_DEBUG
             assert(STACK_LEVEL() + current_cached_values == oparg);
+#endif
 #endif
             assert(tstate->jit_exit == NULL || tstate->jit_exit->executor == current_executor);
             tstate->current_executor = (PyObject *)executor;

Python/ceval.c

@@ -215,6 +215,7 @@ dump_stack(_PyInterpreterFrame *frame, _PyStackRef *stack_pointer)
     _PyFrame_GetStackPointer(frame);
 }
 
+#ifndef _Py_JIT
 static void
 dump_cache_item(_PyStackRef cache, int position, int depth)
 {
@@ -225,6 +226,7 @@ dump_cache_item(_PyStackRef cache, int position, int depth)
         printf("---");
     }
 }
+#endif
 
 static void
 lltrace_instruction(_PyInterpreterFrame *frame,

Python/ceval_macros.h

@@ -212,7 +212,7 @@ GETITEM(PyObject *v, Py_ssize_t i) {
 #define WITHIN_STACK_BOUNDS() \
    (frame->owner == FRAME_OWNED_BY_INTERPRETER || (STACK_LEVEL() >= 0 && STACK_LEVEL() <= STACK_SIZE()))
 
-#ifdef Py_DEBUG
+#if defined(Py_DEBUG) && !defined(_Py_JIT)
 #define WITHIN_STACK_BOUNDS_WITH_CACHE() \
    (frame->owner == FRAME_OWNED_BY_INTERPRETER || (STACK_LEVEL() >= 0 && (STACK_LEVEL() + current_cached_values) <= STACK_SIZE()))
 #else