Merge branch 'main' into account-for-escapes-in-decref-inputs

Python/bytecodes.c

@@ -5266,10 +5266,12 @@ dummy_func(
                 goto exit_unwind;
             }
             next_instr = frame->instr_ptr;
-
-            LLTRACE_RESUME_FRAME();
-
         #ifdef Py_DEBUG
+            int lltrace = maybe_lltrace_resume_frame(frame, GLOBALS());
+            if (lltrace < 0) {
+                JUMP_TO_LABEL(exit_unwind);
+            }
+            frame->lltrace = lltrace;
             /* _PyEval_EvalFrameDefault() must not be called with an exception set,
             because it can clear it (directly or indirectly) and so the
             caller loses its exception */

Python/ceval_macros.h

@@ -121,7 +121,6 @@ do { \
     _PyFrame_SetStackPointer(frame, stack_pointer); \
     int lltrace = maybe_lltrace_resume_frame(frame, GLOBALS()); \
     stack_pointer = _PyFrame_GetStackPointer(frame); \
-    frame->lltrace = lltrace; \
     if (lltrace < 0) { \
         JUMP_TO_LABEL(exit_unwind); \
     } \