From d31d00341c176bd8150e6d501124d410fe2a924d Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sun, 2 Jul 2023 14:37:26 -0700
Subject: [PATCH 1/9] Hacky way to implement jump ops

Introduce a new macro, JUMP_POP_DISPATCH(x, n).
This does JUMPBY(x), STACK_SHRINK(n), DISPATCH().
Most JUMP opcodes can use this.
The exceptions are SEND, JUMP_BACKWARD, and JUMP_BACKWARD_NO_INTERRUPT.
For JUMP_BACKWARD, I have to research whether CHECK_EVAL_BREAKER() and JUMPBY() commute.
I think I'll just punt on SEND (it's too complex anyways).
---
 Python/bytecodes.c                      |  42 ++---
 Python/ceval.c                          |  14 ++
 Python/ceval_macros.h                   |   2 +
 Python/executor_cases.c.h               | 187 ++++++++++++++++++---
 Python/generated_cases.c.h              | 209 ++++++++++++------------
 Python/opcode_metadata.h                |   8 +
 Tools/cases_generator/generate_cases.py |  15 +-
 7 files changed, 323 insertions(+), 154 deletions(-)

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 89b077ac428345..74bfb57fc4c62d 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2219,7 +2219,7 @@ dummy_func(
         }
 
         inst(JUMP_FORWARD, (--)) {
-            JUMPBY(oparg);
+            JUMP_POP_DISPATCH(oparg, 0);
         }
 
         inst(JUMP_BACKWARD, (--)) {
@@ -2272,24 +2272,24 @@ dummy_func(
 
         inst(POP_JUMP_IF_FALSE, (cond -- )) {
             assert(PyBool_Check(cond));
-            JUMPBY(oparg * Py_IsFalse(cond));
+            JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
         }
 
         inst(POP_JUMP_IF_TRUE, (cond -- )) {
             assert(PyBool_Check(cond));
-            JUMPBY(oparg * Py_IsTrue(cond));
+            JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
         }
 
         inst(POP_JUMP_IF_NOT_NONE, (value -- )) {
             if (!Py_IsNone(value)) {
                 DECREF_INPUTS();
-                JUMPBY(oparg);
+                JUMP_POP_DISPATCH(oparg, 1);
             }
         }
 
         inst(POP_JUMP_IF_NONE, (value -- )) {
             if (Py_IsNone(value)) {
-                JUMPBY(oparg);
+                JUMP_POP_DISPATCH(oparg, 1);
             }
             else {
                 DECREF_INPUTS();
@@ -2417,11 +2417,11 @@ dummy_func(
                 assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
                        next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
                 Py_DECREF(iter);
-                STACK_SHRINK(1);
-                SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+                // STACK_SHRINK(1);
+                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
                 /* Jump forward oparg, then skip following END_FOR instruction */
-                JUMPBY(oparg + 1);
-                DISPATCH();
+                JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+                // DISPATCH();
             }
             // Common case: no jump, leave it to the code generator
         }
@@ -2468,11 +2468,11 @@ dummy_func(
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            STACK_SHRINK(1);
-            SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+            // STACK_SHRINK(1);
+            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
-            JUMPBY(oparg + 1);
-            DISPATCH();
+            JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+            // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
         }
@@ -2491,11 +2491,11 @@ dummy_func(
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            STACK_SHRINK(1);
-            SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+            // STACK_SHRINK(1);
+            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
-            JUMPBY(oparg + 1);
-            DISPATCH();
+            JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+            // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
         }
@@ -2505,12 +2505,12 @@ dummy_func(
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
             if (r->len <= 0) {
-                STACK_SHRINK(1);
+                // STACK_SHRINK(1);
                 Py_DECREF(r);
-                SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
                 // Jump over END_FOR instruction.
-                JUMPBY(oparg + 1);
-                DISPATCH();
+                JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+                // DISPATCH();
             }
             long value = r->start;
             r->start = value + r->step;
diff --git a/Python/ceval.c b/Python/ceval.c
index 0ee95bc3a3a4bb..4291085825c5be 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2715,6 +2715,10 @@ void Py_LeaveRecursiveCall(void)
 
 ///////////////////// Experimental UOp Interpreter /////////////////////
 
+#undef JUMP_POP_DISPATCH
+#define JUMP_POP_DISPATCH(x, n) \
+    do { frame->prev_instr += (x); stack_pointer -= (n); goto exit; } while (0)
+
 #undef DEOPT_IF
 #define DEOPT_IF(COND, INSTNAME) \
     if ((COND)) {                \
@@ -2795,6 +2799,16 @@ _PyUopExecute(_PyExecutorObject *executor, _PyInterpreterFrame *frame, PyObject
         }
     }
 
+exit:
+#ifdef LLTRACE
+    if (lltrace >= 2) {
+        fprintf(stderr, "Jumping!\n");
+    }
+#endif
+    _PyFrame_SetStackPointer(frame, stack_pointer);
+    Py_DECREF(self);
+    return frame;
+
 unbound_local_error:
     format_exc_check_arg(tstate, PyExc_UnboundLocalError,
         UNBOUNDLOCAL_ERROR_MSG,
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
index 72800aaaaa2ac4..aa161349026490 100644
--- a/Python/ceval_macros.h
+++ b/Python/ceval_macros.h
@@ -155,6 +155,8 @@ GETITEM(PyObject *v, Py_ssize_t i) {
 #define JUMPBY(x)       (next_instr += (x))
 #define SKIP_OVER(x)    (next_instr += (x))
 
+#define JUMP_POP_DISPATCH(x, n) do { JUMPBY(x); STACK_SHRINK(n); DISPATCH(); } while (0)
+
 /* OpCode prediction macros
     Some opcodes tend to come in pairs thus making it possible to
     predict the second code when the first is run.  For example,
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 29ebb0b3e8b2d9..35cb7fc6fef814 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1626,6 +1626,61 @@
             break;
         }
 
+        case JUMP_FORWARD: {
+            #line 2222 "Python/bytecodes.c"
+            JUMP_POP_DISPATCH(oparg, 0);
+            #line 1633 "Python/executor_cases.c.h"
+            break;
+        }
+
+        case POP_JUMP_IF_FALSE: {
+            PyObject *cond = stack_pointer[-1];
+            #line 2274 "Python/bytecodes.c"
+            assert(PyBool_Check(cond));
+            JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
+            #line 1642 "Python/executor_cases.c.h"
+            break;
+        }
+
+        case POP_JUMP_IF_TRUE: {
+            PyObject *cond = stack_pointer[-1];
+            #line 2279 "Python/bytecodes.c"
+            assert(PyBool_Check(cond));
+            JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
+            #line 1651 "Python/executor_cases.c.h"
+            break;
+        }
+
+        case POP_JUMP_IF_NOT_NONE: {
+            PyObject *value = stack_pointer[-1];
+            #line 2284 "Python/bytecodes.c"
+            if (!Py_IsNone(value)) {
+            #line 1659 "Python/executor_cases.c.h"
+                Py_DECREF(value);
+            #line 2286 "Python/bytecodes.c"
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
+            #line 1664 "Python/executor_cases.c.h"
+            STACK_SHRINK(1);
+            break;
+        }
+
+        case POP_JUMP_IF_NONE: {
+            PyObject *value = stack_pointer[-1];
+            #line 2291 "Python/bytecodes.c"
+            if (Py_IsNone(value)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
+            else {
+            #line 1676 "Python/executor_cases.c.h"
+                Py_DECREF(value);
+            #line 2296 "Python/bytecodes.c"
+            }
+            #line 1680 "Python/executor_cases.c.h"
+            STACK_SHRINK(1);
+            break;
+        }
+
         case GET_LEN: {
             PyObject *obj = stack_pointer[-1];
             PyObject *len_o;
@@ -1635,7 +1690,7 @@
             if (len_i < 0) goto error;
             len_o = PyLong_FromSsize_t(len_i);
             if (len_o == NULL) goto error;
-            #line 1639 "Python/executor_cases.c.h"
+            #line 1694 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = len_o;
             break;
@@ -1651,7 +1706,7 @@
             // None on failure.
             assert(PyTuple_CheckExact(names));
             attrs = match_class(tstate, subject, type, oparg, names);
-            #line 1655 "Python/executor_cases.c.h"
+            #line 1710 "Python/executor_cases.c.h"
             Py_DECREF(subject);
             Py_DECREF(type);
             Py_DECREF(names);
@@ -1663,7 +1718,7 @@
                 if (_PyErr_Occurred(tstate)) goto pop_3_error;
                 attrs = Py_None;  // Failure!
             }
-            #line 1667 "Python/executor_cases.c.h"
+            #line 1722 "Python/executor_cases.c.h"
             STACK_SHRINK(2);
             stack_pointer[-1] = attrs;
             break;
@@ -1675,7 +1730,7 @@
             #line 2332 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             res = match ? Py_True : Py_False;
-            #line 1679 "Python/executor_cases.c.h"
+            #line 1734 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1687,7 +1742,7 @@
             #line 2337 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             res = match ? Py_True : Py_False;
-            #line 1691 "Python/executor_cases.c.h"
+            #line 1746 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1701,7 +1756,7 @@
             // On successful match, PUSH(values). Otherwise, PUSH(None).
             values_or_none = match_keys(tstate, subject, keys);
             if (values_or_none == NULL) goto error;
-            #line 1705 "Python/executor_cases.c.h"
+            #line 1760 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = values_or_none;
             break;
@@ -1713,11 +1768,11 @@
             #line 2348 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             iter = PyObject_GetIter(iterable);
-            #line 1717 "Python/executor_cases.c.h"
+            #line 1772 "Python/executor_cases.c.h"
             Py_DECREF(iterable);
             #line 2351 "Python/bytecodes.c"
             if (iter == NULL) goto pop_1_error;
-            #line 1721 "Python/executor_cases.c.h"
+            #line 1776 "Python/executor_cases.c.h"
             stack_pointer[-1] = iter;
             break;
         }
@@ -1748,15 +1803,103 @@
                 if (iter == NULL) {
                     goto error;
                 }
-            #line 1752 "Python/executor_cases.c.h"
+            #line 1807 "Python/executor_cases.c.h"
                 Py_DECREF(iterable);
             #line 2378 "Python/bytecodes.c"
             }
-            #line 1756 "Python/executor_cases.c.h"
+            #line 1811 "Python/executor_cases.c.h"
             stack_pointer[-1] = iter;
             break;
         }
 
+        case FOR_ITER_LIST: {
+            PyObject *iter = stack_pointer[-1];
+            PyObject *next;
+            #line 2458 "Python/bytecodes.c"
+            DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
+            _PyListIterObject *it = (_PyListIterObject *)iter;
+            STAT_INC(FOR_ITER, hit);
+            PyListObject *seq = it->it_seq;
+            if (seq) {
+                if (it->it_index < PyList_GET_SIZE(seq)) {
+                    next = Py_NewRef(PyList_GET_ITEM(seq, it->it_index++));
+                    goto end_for_iter_list;  // End of this instruction
+                }
+                it->it_seq = NULL;
+                Py_DECREF(seq);
+            }
+            Py_DECREF(iter);
+            // STACK_SHRINK(1);
+            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+            /* Jump forward oparg, then skip following END_FOR instruction */
+            JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+            // DISPATCH();
+        end_for_iter_list:
+            // Common case: no jump, leave it to the code generator
+            #line 1840 "Python/executor_cases.c.h"
+            STACK_GROW(1);
+            stack_pointer[-1] = next;
+            break;
+        }
+
+        case FOR_ITER_TUPLE: {
+            PyObject *iter = stack_pointer[-1];
+            PyObject *next;
+            #line 2481 "Python/bytecodes.c"
+            _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
+            DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
+            STAT_INC(FOR_ITER, hit);
+            PyTupleObject *seq = it->it_seq;
+            if (seq) {
+                if (it->it_index < PyTuple_GET_SIZE(seq)) {
+                    next = Py_NewRef(PyTuple_GET_ITEM(seq, it->it_index++));
+                    goto end_for_iter_tuple;  // End of this instruction
+                }
+                it->it_seq = NULL;
+                Py_DECREF(seq);
+            }
+            Py_DECREF(iter);
+            // STACK_SHRINK(1);
+            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+            /* Jump forward oparg, then skip following END_FOR instruction */
+            JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+            // DISPATCH();
+        end_for_iter_tuple:
+            // Common case: no jump, leave it to the code generator
+            #line 1870 "Python/executor_cases.c.h"
+            STACK_GROW(1);
+            stack_pointer[-1] = next;
+            break;
+        }
+
+        case FOR_ITER_RANGE: {
+            PyObject *iter = stack_pointer[-1];
+            PyObject *next;
+            #line 2504 "Python/bytecodes.c"
+            _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
+            DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
+            STAT_INC(FOR_ITER, hit);
+            if (r->len <= 0) {
+                // STACK_SHRINK(1);
+                Py_DECREF(r);
+                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+                // Jump over END_FOR instruction.
+                JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+                // DISPATCH();
+            }
+            long value = r->start;
+            r->start = value + r->step;
+            r->len--;
+            next = PyLong_FromLong(value);
+            if (next == NULL) {
+                goto error;
+            }
+            #line 1898 "Python/executor_cases.c.h"
+            STACK_GROW(1);
+            stack_pointer[-1] = next;
+            break;
+        }
+
         case WITH_EXCEPT_START: {
             PyObject *val = stack_pointer[-1];
             PyObject *lasti = stack_pointer[-3];
@@ -1783,7 +1926,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 1787 "Python/executor_cases.c.h"
+            #line 1930 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1802,7 +1945,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 1806 "Python/executor_cases.c.h"
+            #line 1949 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -1819,7 +1962,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 1823 "Python/executor_cases.c.h"
+            #line 1966 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
@@ -1839,7 +1982,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 1843 "Python/executor_cases.c.h"
+            #line 1986 "Python/executor_cases.c.h"
             stack_pointer[-1] = func;
             break;
         }
@@ -1872,7 +2015,7 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 1876 "Python/executor_cases.c.h"
+            #line 2019 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             break;
@@ -1885,13 +2028,13 @@
             PyObject *slice;
             #line 3497 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 1889 "Python/executor_cases.c.h"
+            #line 2032 "Python/executor_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
             #line 3499 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 1895 "Python/executor_cases.c.h"
+            #line 2038 "Python/executor_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -1908,7 +2051,7 @@
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 1912 "Python/executor_cases.c.h"
+            #line 2055 "Python/executor_cases.c.h"
             stack_pointer[-1] = result;
             break;
         }
@@ -1927,7 +2070,7 @@
             else {
                 res = value;
             }
-            #line 1931 "Python/executor_cases.c.h"
+            #line 2074 "Python/executor_cases.c.h"
             stack_pointer[-1] = res;
             break;
         }
@@ -1941,7 +2084,7 @@
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 1945 "Python/executor_cases.c.h"
+            #line 2088 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             break;
@@ -1953,7 +2096,7 @@
             #line 3532 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 1957 "Python/executor_cases.c.h"
+            #line 2100 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             break;
@@ -1964,7 +2107,7 @@
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
             #line 3557 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 1968 "Python/executor_cases.c.h"
+            #line 2111 "Python/executor_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             break;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index eb8b50e5c905d4..4f3257423a55f9 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3175,9 +3175,8 @@
 
         TARGET(JUMP_FORWARD) {
             #line 2222 "Python/bytecodes.c"
-            JUMPBY(oparg);
+            JUMP_POP_DISPATCH(oparg, 0);
             #line 3180 "Python/generated_cases.c.h"
-            DISPATCH();
         }
 
         TARGET(JUMP_BACKWARD) {
@@ -3200,7 +3199,7 @@
                 goto resume_frame;
             }
             #endif  /* ENABLE_SPECIALIZATION */
-            #line 3204 "Python/generated_cases.c.h"
+            #line 3203 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -3220,39 +3219,35 @@
                 goto resume_with_error;
             }
             goto resume_frame;
-            #line 3224 "Python/generated_cases.c.h"
+            #line 3223 "Python/generated_cases.c.h"
         }
 
         TARGET(POP_JUMP_IF_FALSE) {
             PyObject *cond = stack_pointer[-1];
             #line 2274 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
-            JUMPBY(oparg * Py_IsFalse(cond));
-            #line 3232 "Python/generated_cases.c.h"
-            STACK_SHRINK(1);
-            DISPATCH();
+            JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
+            #line 3231 "Python/generated_cases.c.h"
         }
 
         TARGET(POP_JUMP_IF_TRUE) {
             PyObject *cond = stack_pointer[-1];
             #line 2279 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
-            JUMPBY(oparg * Py_IsTrue(cond));
-            #line 3242 "Python/generated_cases.c.h"
-            STACK_SHRINK(1);
-            DISPATCH();
+            JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
+            #line 3239 "Python/generated_cases.c.h"
         }
 
         TARGET(POP_JUMP_IF_NOT_NONE) {
             PyObject *value = stack_pointer[-1];
             #line 2284 "Python/bytecodes.c"
             if (!Py_IsNone(value)) {
-            #line 3251 "Python/generated_cases.c.h"
+            #line 3246 "Python/generated_cases.c.h"
                 Py_DECREF(value);
             #line 2286 "Python/bytecodes.c"
-                JUMPBY(oparg);
+                JUMP_POP_DISPATCH(oparg, 1);
             }
-            #line 3256 "Python/generated_cases.c.h"
+            #line 3251 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -3261,14 +3256,14 @@
             PyObject *value = stack_pointer[-1];
             #line 2291 "Python/bytecodes.c"
             if (Py_IsNone(value)) {
-                JUMPBY(oparg);
+                JUMP_POP_DISPATCH(oparg, 1);
             }
             else {
-            #line 3268 "Python/generated_cases.c.h"
+            #line 3263 "Python/generated_cases.c.h"
                 Py_DECREF(value);
             #line 2296 "Python/bytecodes.c"
             }
-            #line 3272 "Python/generated_cases.c.h"
+            #line 3267 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -3281,7 +3276,7 @@
              * (see bpo-30039).
              */
             JUMPBY(-oparg);
-            #line 3285 "Python/generated_cases.c.h"
+            #line 3280 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -3294,7 +3289,7 @@
             if (len_i < 0) goto error;
             len_o = PyLong_FromSsize_t(len_i);
             if (len_o == NULL) goto error;
-            #line 3298 "Python/generated_cases.c.h"
+            #line 3293 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = len_o;
             DISPATCH();
@@ -3310,7 +3305,7 @@
             // None on failure.
             assert(PyTuple_CheckExact(names));
             attrs = match_class(tstate, subject, type, oparg, names);
-            #line 3314 "Python/generated_cases.c.h"
+            #line 3309 "Python/generated_cases.c.h"
             Py_DECREF(subject);
             Py_DECREF(type);
             Py_DECREF(names);
@@ -3322,7 +3317,7 @@
                 if (_PyErr_Occurred(tstate)) goto pop_3_error;
                 attrs = Py_None;  // Failure!
             }
-            #line 3326 "Python/generated_cases.c.h"
+            #line 3321 "Python/generated_cases.c.h"
             STACK_SHRINK(2);
             stack_pointer[-1] = attrs;
             DISPATCH();
@@ -3334,7 +3329,7 @@
             #line 2332 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             res = match ? Py_True : Py_False;
-            #line 3338 "Python/generated_cases.c.h"
+            #line 3333 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3346,7 +3341,7 @@
             #line 2337 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             res = match ? Py_True : Py_False;
-            #line 3350 "Python/generated_cases.c.h"
+            #line 3345 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3360,7 +3355,7 @@
             // On successful match, PUSH(values). Otherwise, PUSH(None).
             values_or_none = match_keys(tstate, subject, keys);
             if (values_or_none == NULL) goto error;
-            #line 3364 "Python/generated_cases.c.h"
+            #line 3359 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = values_or_none;
             DISPATCH();
@@ -3372,11 +3367,11 @@
             #line 2348 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             iter = PyObject_GetIter(iterable);
-            #line 3376 "Python/generated_cases.c.h"
+            #line 3371 "Python/generated_cases.c.h"
             Py_DECREF(iterable);
             #line 2351 "Python/bytecodes.c"
             if (iter == NULL) goto pop_1_error;
-            #line 3380 "Python/generated_cases.c.h"
+            #line 3375 "Python/generated_cases.c.h"
             stack_pointer[-1] = iter;
             DISPATCH();
         }
@@ -3407,11 +3402,11 @@
                 if (iter == NULL) {
                     goto error;
                 }
-            #line 3411 "Python/generated_cases.c.h"
+            #line 3406 "Python/generated_cases.c.h"
                 Py_DECREF(iterable);
             #line 2378 "Python/bytecodes.c"
             }
-            #line 3415 "Python/generated_cases.c.h"
+            #line 3410 "Python/generated_cases.c.h"
             stack_pointer[-1] = iter;
             DISPATCH();
         }
@@ -3446,14 +3441,14 @@
                 assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
                        next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
                 Py_DECREF(iter);
-                STACK_SHRINK(1);
-                SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+                // STACK_SHRINK(1);
+                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
                 /* Jump forward oparg, then skip following END_FOR instruction */
-                JUMPBY(oparg + 1);
-                DISPATCH();
+                JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+                // DISPATCH();
             }
             // Common case: no jump, leave it to the code generator
-            #line 3457 "Python/generated_cases.c.h"
+            #line 3452 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3487,7 +3482,7 @@
                 target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
             }
             INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
-            #line 3491 "Python/generated_cases.c.h"
+            #line 3486 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -3508,14 +3503,14 @@
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            STACK_SHRINK(1);
-            SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+            // STACK_SHRINK(1);
+            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
-            JUMPBY(oparg + 1);
-            DISPATCH();
+            JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+            // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 3519 "Python/generated_cases.c.h"
+            #line 3514 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3539,14 +3534,14 @@
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            STACK_SHRINK(1);
-            SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+            // STACK_SHRINK(1);
+            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
-            JUMPBY(oparg + 1);
-            DISPATCH();
+            JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+            // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 3550 "Python/generated_cases.c.h"
+            #line 3545 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3561,12 +3556,12 @@
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
             if (r->len <= 0) {
-                STACK_SHRINK(1);
+                // STACK_SHRINK(1);
                 Py_DECREF(r);
-                SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
+                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
                 // Jump over END_FOR instruction.
-                JUMPBY(oparg + 1);
-                DISPATCH();
+                JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
+                // DISPATCH();
             }
             long value = r->start;
             r->start = value + r->step;
@@ -3575,7 +3570,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 3579 "Python/generated_cases.c.h"
+            #line 3574 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3600,7 +3595,7 @@
             assert(next_instr[oparg].op.code == END_FOR ||
                    next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
             DISPATCH_INLINED(gen_frame);
-            #line 3604 "Python/generated_cases.c.h"
+            #line 3599 "Python/generated_cases.c.h"
         }
 
         TARGET(BEFORE_ASYNC_WITH) {
@@ -3630,7 +3625,7 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3634 "Python/generated_cases.c.h"
+            #line 3629 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
             #line 2566 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
@@ -3639,7 +3634,7 @@
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3643 "Python/generated_cases.c.h"
+            #line 3638 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3676,7 +3671,7 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3680 "Python/generated_cases.c.h"
+            #line 3675 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
             #line 2601 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
@@ -3685,7 +3680,7 @@
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3689 "Python/generated_cases.c.h"
+            #line 3684 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3718,7 +3713,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 3722 "Python/generated_cases.c.h"
+            #line 3717 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3737,7 +3732,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 3741 "Python/generated_cases.c.h"
+            #line 3736 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -3768,7 +3763,7 @@
             assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
             res = self;
             assert(oparg & 1);
-            #line 3772 "Python/generated_cases.c.h"
+            #line 3767 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3792,7 +3787,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3796 "Python/generated_cases.c.h"
+            #line 3791 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3820,7 +3815,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3824 "Python/generated_cases.c.h"
+            #line 3819 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3833,7 +3828,7 @@
             assert(kwnames == NULL);
             assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
             kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
-            #line 3837 "Python/generated_cases.c.h"
+            #line 3832 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -3851,7 +3846,7 @@
             _PyCallCache *cache = (_PyCallCache *)next_instr;
             INCREMENT_ADAPTIVE_COUNTER(cache->counter);
             GO_TO_INSTRUCTION(CALL);
-            #line 3855 "Python/generated_cases.c.h"
+            #line 3850 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL) {
@@ -3943,7 +3938,7 @@
                 Py_DECREF(args[i]);
             }
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 3947 "Python/generated_cases.c.h"
+            #line 3942 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -3965,7 +3960,7 @@
             PEEK(oparg + 2) = Py_NewRef(meth);  // method
             Py_DECREF(callable);
             GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
-            #line 3969 "Python/generated_cases.c.h"
+            #line 3964 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_EXACT_ARGS) {
@@ -4000,7 +3995,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4004 "Python/generated_cases.c.h"
+            #line 3999 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -4044,7 +4039,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4048 "Python/generated_cases.c.h"
+            #line 4043 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_TYPE_1) {
@@ -4062,7 +4057,7 @@
             res = Py_NewRef(Py_TYPE(obj));
             Py_DECREF(obj);
             Py_DECREF(&PyType_Type);  // I.e., callable
-            #line 4066 "Python/generated_cases.c.h"
+            #line 4061 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4086,7 +4081,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyUnicode_Type);  // I.e., callable
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4090 "Python/generated_cases.c.h"
+            #line 4085 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4111,7 +4106,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyTuple_Type);  // I.e., tuple
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4115 "Python/generated_cases.c.h"
+            #line 4110 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4175,7 +4170,7 @@
              * as it will be checked after start_frame */
             tstate->py_recursion_remaining--;
             goto start_frame;
-            #line 4179 "Python/generated_cases.c.h"
+            #line 4174 "Python/generated_cases.c.h"
         }
 
         TARGET(EXIT_INIT_CHECK) {
@@ -4188,7 +4183,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 4192 "Python/generated_cases.c.h"
+            #line 4187 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -4220,7 +4215,7 @@
             }
             Py_DECREF(tp);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4224 "Python/generated_cases.c.h"
+            #line 4219 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4262,7 +4257,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4266 "Python/generated_cases.c.h"
+            #line 4261 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4308,7 +4303,7 @@
                    'invalid'). In those cases an exception is set, so we must
                    handle it.
                 */
-            #line 4312 "Python/generated_cases.c.h"
+            #line 4307 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4354,7 +4349,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4358 "Python/generated_cases.c.h"
+            #line 4353 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4393,7 +4388,7 @@
             Py_DECREF(callable);
             Py_DECREF(arg);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4397 "Python/generated_cases.c.h"
+            #line 4392 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4433,7 +4428,7 @@
             Py_DECREF(cls);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4437 "Python/generated_cases.c.h"
+            #line 4432 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4463,7 +4458,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
             assert(next_instr[-1].op.code == POP_TOP);
             DISPATCH();
-            #line 4467 "Python/generated_cases.c.h"
+            #line 4462 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
@@ -4501,7 +4496,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4505 "Python/generated_cases.c.h"
+            #line 4500 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4543,7 +4538,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4547 "Python/generated_cases.c.h"
+            #line 4542 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4585,7 +4580,7 @@
             Py_DECREF(self);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4589 "Python/generated_cases.c.h"
+            #line 4584 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4626,7 +4621,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4630 "Python/generated_cases.c.h"
+            #line 4625 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4638,7 +4633,7 @@
         TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
             #line 3361 "Python/bytecodes.c"
             GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
-            #line 4642 "Python/generated_cases.c.h"
+            #line 4637 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_FUNCTION_EX) {
@@ -4709,14 +4704,14 @@
                 }
                 result = PyObject_Call(func, callargs, kwargs);
             }
-            #line 4713 "Python/generated_cases.c.h"
+            #line 4708 "Python/generated_cases.c.h"
             Py_DECREF(func);
             Py_DECREF(callargs);
             Py_XDECREF(kwargs);
             #line 3427 "Python/bytecodes.c"
             assert(PEEK(3 + (oparg & 1)) == NULL);
             if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
-            #line 4720 "Python/generated_cases.c.h"
+            #line 4715 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg & 1) ? 1 : 0));
             STACK_SHRINK(2);
             stack_pointer[-1] = result;
@@ -4739,7 +4734,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 4743 "Python/generated_cases.c.h"
+            #line 4738 "Python/generated_cases.c.h"
             stack_pointer[-1] = func;
             DISPATCH();
         }
@@ -4772,7 +4767,7 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 4776 "Python/generated_cases.c.h"
+            #line 4771 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             DISPATCH();
@@ -4800,7 +4795,7 @@
             frame = cframe.current_frame = prev;
             _PyFrame_StackPush(frame, (PyObject *)gen);
             goto resume_frame;
-            #line 4804 "Python/generated_cases.c.h"
+            #line 4799 "Python/generated_cases.c.h"
         }
 
         TARGET(BUILD_SLICE) {
@@ -4810,13 +4805,13 @@
             PyObject *slice;
             #line 3497 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 4814 "Python/generated_cases.c.h"
+            #line 4809 "Python/generated_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
             #line 3499 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 4820 "Python/generated_cases.c.h"
+            #line 4815 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -4833,7 +4828,7 @@
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 4837 "Python/generated_cases.c.h"
+            #line 4832 "Python/generated_cases.c.h"
             stack_pointer[-1] = result;
             DISPATCH();
         }
@@ -4852,7 +4847,7 @@
             else {
                 res = value;
             }
-            #line 4856 "Python/generated_cases.c.h"
+            #line 4851 "Python/generated_cases.c.h"
             stack_pointer[-1] = res;
             DISPATCH();
         }
@@ -4866,7 +4861,7 @@
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 4870 "Python/generated_cases.c.h"
+            #line 4865 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -4878,7 +4873,7 @@
             #line 3532 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 4882 "Python/generated_cases.c.h"
+            #line 4877 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             DISPATCH();
@@ -4905,12 +4900,12 @@
             assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
             assert(binary_ops[oparg]);
             res = binary_ops[oparg](lhs, rhs);
-            #line 4909 "Python/generated_cases.c.h"
+            #line 4904 "Python/generated_cases.c.h"
             Py_DECREF(lhs);
             Py_DECREF(rhs);
             #line 3552 "Python/bytecodes.c"
             if (res == NULL) goto pop_2_error;
-            #line 4914 "Python/generated_cases.c.h"
+            #line 4909 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             next_instr += 1;
@@ -4922,7 +4917,7 @@
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
             #line 3557 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 4926 "Python/generated_cases.c.h"
+            #line 4921 "Python/generated_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             DISPATCH();
@@ -4941,13 +4936,13 @@
             assert(next_opcode > 0 && next_opcode < 256);
             opcode = next_opcode;
             DISPATCH_GOTO();
-            #line 4945 "Python/generated_cases.c.h"
+            #line 4940 "Python/generated_cases.c.h"
         }
 
         TARGET(INSTRUMENTED_JUMP_FORWARD) {
             #line 3575 "Python/bytecodes.c"
             INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4951 "Python/generated_cases.c.h"
+            #line 4946 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -4955,7 +4950,7 @@
             #line 3579 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
             INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4959 "Python/generated_cases.c.h"
+            #line 4954 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -4966,7 +4961,7 @@
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsTrue(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4970 "Python/generated_cases.c.h"
+            #line 4965 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -4977,7 +4972,7 @@
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsFalse(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4981 "Python/generated_cases.c.h"
+            #line 4976 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -4994,7 +4989,7 @@
                 offset = 0;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4998 "Python/generated_cases.c.h"
+            #line 4993 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -5011,7 +5006,7 @@
                 offset = oparg;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 5015 "Python/generated_cases.c.h"
+            #line 5010 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
@@ -5022,19 +5017,19 @@
             oparg = oparg << 8 | next_instr->op.arg;
             PRE_DISPATCH_GOTO();
             DISPATCH_GOTO();
-            #line 5026 "Python/generated_cases.c.h"
+            #line 5021 "Python/generated_cases.c.h"
         }
 
         TARGET(CACHE) {
             #line 3636 "Python/bytecodes.c"
             assert(0 && "Executing a cache.");
             Py_UNREACHABLE();
-            #line 5033 "Python/generated_cases.c.h"
+            #line 5028 "Python/generated_cases.c.h"
         }
 
         TARGET(RESERVED) {
             #line 3641 "Python/bytecodes.c"
             assert(0 && "Executing RESERVED instruction.");
             Py_UNREACHABLE();
-            #line 5040 "Python/generated_cases.c.h"
+            #line 5035 "Python/generated_cases.c.h"
         }
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index ac86a4abd9c1b3..88eb8a388016f0 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -1244,6 +1244,11 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
     [CONTAINS_OP] = { .nuops = 1, .uops = { { CONTAINS_OP, 0, 0 } } },
     [CHECK_EG_MATCH] = { .nuops = 1, .uops = { { CHECK_EG_MATCH, 0, 0 } } },
     [CHECK_EXC_MATCH] = { .nuops = 1, .uops = { { CHECK_EXC_MATCH, 0, 0 } } },
+    [JUMP_FORWARD] = { .nuops = 1, .uops = { { JUMP_FORWARD, 0, 0 } } },
+    [POP_JUMP_IF_FALSE] = { .nuops = 1, .uops = { { POP_JUMP_IF_FALSE, 0, 0 } } },
+    [POP_JUMP_IF_TRUE] = { .nuops = 1, .uops = { { POP_JUMP_IF_TRUE, 0, 0 } } },
+    [POP_JUMP_IF_NOT_NONE] = { .nuops = 1, .uops = { { POP_JUMP_IF_NOT_NONE, 0, 0 } } },
+    [POP_JUMP_IF_NONE] = { .nuops = 1, .uops = { { POP_JUMP_IF_NONE, 0, 0 } } },
     [GET_LEN] = { .nuops = 1, .uops = { { GET_LEN, 0, 0 } } },
     [MATCH_CLASS] = { .nuops = 1, .uops = { { MATCH_CLASS, 0, 0 } } },
     [MATCH_MAPPING] = { .nuops = 1, .uops = { { MATCH_MAPPING, 0, 0 } } },
@@ -1251,6 +1256,9 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
     [MATCH_KEYS] = { .nuops = 1, .uops = { { MATCH_KEYS, 0, 0 } } },
     [GET_ITER] = { .nuops = 1, .uops = { { GET_ITER, 0, 0 } } },
     [GET_YIELD_FROM_ITER] = { .nuops = 1, .uops = { { GET_YIELD_FROM_ITER, 0, 0 } } },
+    [FOR_ITER_LIST] = { .nuops = 1, .uops = { { FOR_ITER_LIST, 0, 0 } } },
+    [FOR_ITER_TUPLE] = { .nuops = 1, .uops = { { FOR_ITER_TUPLE, 0, 0 } } },
+    [FOR_ITER_RANGE] = { .nuops = 1, .uops = { { FOR_ITER_RANGE, 0, 0 } } },
     [WITH_EXCEPT_START] = { .nuops = 1, .uops = { { WITH_EXCEPT_START, 0, 0 } } },
     [PUSH_EXC_INFO] = { .nuops = 1, .uops = { { PUSH_EXC_INFO, 0, 0 } } },
     [EXIT_INIT_CHECK] = { .nuops = 1, .uops = { { EXIT_INIT_CHECK, 0, 0 } } },
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
index a90abfe20c1739..9d5e14be3f5bc0 100644
--- a/Tools/cases_generator/generate_cases.py
+++ b/Tools/cases_generator/generate_cases.py
@@ -264,7 +264,10 @@ def fromInstruction(instr: "AnyInstruction"):
             HAS_ARG_FLAG=variable_used(instr, "oparg"),
             HAS_CONST_FLAG=variable_used(instr, "FRAME_CO_CONSTS"),
             HAS_NAME_FLAG=variable_used(instr, "FRAME_CO_NAMES"),
-            HAS_JUMP_FLAG=variable_used(instr, "JUMPBY"),
+            HAS_JUMP_FLAG=(
+                variable_used(instr, "JUMPBY")
+                or variable_used(instr, "JUMP_POP_DISPATCH")
+            ),
         )
 
     @staticmethod
@@ -314,12 +317,18 @@ class ActiveCacheEffect:
     "oparg1",  # Proxy for super-instructions like LOAD_FAST_LOAD_FAST
     "JUMPBY",
     "DISPATCH",
+    "GO_TO_INSTRUCTION",
+    "SKIP_OVER",
     "INSTRUMENTED_JUMP",
     "throwflag",
     "exception_unwind",
     "import_from",
     "import_name",
     "_PyObject_CallNoArgs",  # Proxy for BEFORE_WITH
+    "cframe",
+    "resume_frame",
+    "CACHE",
+    "RESERVED",
 )
 
 
@@ -399,9 +408,6 @@ def __init__(self, inst: parser.InstDef):
 
     def is_viable_uop(self) -> bool:
         """Whether this instruction is viable as a uop."""
-        if self.always_exits:
-            # print(f"Skipping {self.name} because it always exits")
-            return False
         if self.instr_flags.HAS_ARG_FLAG:
             # If the instruction uses oparg, it cannot use any caches
             if self.active_caches:
@@ -1573,6 +1579,7 @@ def always_exits(lines: list[str]) -> bool:
             "goto ",
             "return ",
             "DISPATCH",
+            "JUMP_POP_DISPATCH",
             "GO_TO_",
             "Py_UNREACHABLE()",
             "ERROR_IF(true, ",

From b886ca64cc8402538893474ca01bbf0995c702da Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 12:13:38 -0700
Subject: [PATCH 2/9] Make JUMP_BACKWARD[_NO_INTERRUPT] viable

This involves some subtle rearrangement of code in JUMP_BACKWARD.
---
 Python/bytecodes.c         |   7 +-
 Python/ceval.c             |   6 +-
 Python/executor_cases.c.h  | 124 ++++++++-------
 Python/generated_cases.c.h | 315 ++++++++++++++++++-------------------
 Python/opcode_metadata.h   |   1 +
 5 files changed, 231 insertions(+), 222 deletions(-)

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 74bfb57fc4c62d..9b55b8decea274 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2224,12 +2224,12 @@ dummy_func(
 
         inst(JUMP_BACKWARD, (--)) {
             CHECK_EVAL_BREAKER();
+            #if ENABLE_SPECIALIZATION
             _Py_CODEUNIT *here = next_instr - 1;
             assert(oparg <= INSTR_OFFSET());
-            JUMPBY(1-oparg);
-            #if ENABLE_SPECIALIZATION
             here[1].cache += (1 << OPTIMIZER_BITS_IN_COUNTER);
             if (here[1].cache > tstate->interp->optimizer_backedge_threshold) {
+                JUMPBY(1 - oparg);
                 OBJECT_STAT_INC(optimization_attempts);
                 frame = _PyOptimizer_BackEdge(frame, here, next_instr, stack_pointer);
                 if (frame == NULL) {
@@ -2241,6 +2241,7 @@ dummy_func(
                 goto resume_frame;
             }
             #endif  /* ENABLE_SPECIALIZATION */
+            JUMP_POP_DISPATCH(1 - oparg, 0);
         }
 
         pseudo(JUMP) = {
@@ -2302,7 +2303,7 @@ dummy_func(
              * generator or coroutine, so we deliberately do not check it here.
              * (see bpo-30039).
              */
-            JUMPBY(-oparg);
+            JUMP_POP_DISPATCH(-oparg, 0);
         }
 
         inst(GET_LEN, (obj -- obj, len_o)) {
diff --git a/Python/ceval.c b/Python/ceval.c
index 4291085825c5be..0d9401b4ac3fd5 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2800,11 +2800,7 @@ _PyUopExecute(_PyExecutorObject *executor, _PyInterpreterFrame *frame, PyObject
     }
 
 exit:
-#ifdef LLTRACE
-    if (lltrace >= 2) {
-        fprintf(stderr, "Jumping!\n");
-    }
-#endif
+    DPRINTF(2, "Jumping!\n");
     _PyFrame_SetStackPointer(frame, stack_pointer);
     Py_DECREF(self);
     return frame;
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 35cb7fc6fef814..b40efe00a8bd17 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1635,7 +1635,7 @@
 
         case POP_JUMP_IF_FALSE: {
             PyObject *cond = stack_pointer[-1];
-            #line 2274 "Python/bytecodes.c"
+            #line 2275 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
             JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
             #line 1642 "Python/executor_cases.c.h"
@@ -1644,7 +1644,7 @@
 
         case POP_JUMP_IF_TRUE: {
             PyObject *cond = stack_pointer[-1];
-            #line 2279 "Python/bytecodes.c"
+            #line 2280 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
             JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
             #line 1651 "Python/executor_cases.c.h"
@@ -1653,11 +1653,11 @@
 
         case POP_JUMP_IF_NOT_NONE: {
             PyObject *value = stack_pointer[-1];
-            #line 2284 "Python/bytecodes.c"
+            #line 2285 "Python/bytecodes.c"
             if (!Py_IsNone(value)) {
             #line 1659 "Python/executor_cases.c.h"
                 Py_DECREF(value);
-            #line 2286 "Python/bytecodes.c"
+            #line 2287 "Python/bytecodes.c"
                 JUMP_POP_DISPATCH(oparg, 1);
             }
             #line 1664 "Python/executor_cases.c.h"
@@ -1667,30 +1667,42 @@
 
         case POP_JUMP_IF_NONE: {
             PyObject *value = stack_pointer[-1];
-            #line 2291 "Python/bytecodes.c"
+            #line 2292 "Python/bytecodes.c"
             if (Py_IsNone(value)) {
                 JUMP_POP_DISPATCH(oparg, 1);
             }
             else {
             #line 1676 "Python/executor_cases.c.h"
                 Py_DECREF(value);
-            #line 2296 "Python/bytecodes.c"
+            #line 2297 "Python/bytecodes.c"
             }
             #line 1680 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
 
+        case JUMP_BACKWARD_NO_INTERRUPT: {
+            #line 2301 "Python/bytecodes.c"
+            /* This bytecode is used in the `yield from` or `await` loop.
+             * If there is an interrupt, we want it handled in the innermost
+             * generator or coroutine, so we deliberately do not check it here.
+             * (see bpo-30039).
+             */
+            JUMP_POP_DISPATCH(-oparg, 0);
+            #line 1693 "Python/executor_cases.c.h"
+            break;
+        }
+
         case GET_LEN: {
             PyObject *obj = stack_pointer[-1];
             PyObject *len_o;
-            #line 2309 "Python/bytecodes.c"
+            #line 2310 "Python/bytecodes.c"
             // PUSH(len(TOS))
             Py_ssize_t len_i = PyObject_Length(obj);
             if (len_i < 0) goto error;
             len_o = PyLong_FromSsize_t(len_i);
             if (len_o == NULL) goto error;
-            #line 1694 "Python/executor_cases.c.h"
+            #line 1706 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = len_o;
             break;
@@ -1701,16 +1713,16 @@
             PyObject *type = stack_pointer[-2];
             PyObject *subject = stack_pointer[-3];
             PyObject *attrs;
-            #line 2317 "Python/bytecodes.c"
+            #line 2318 "Python/bytecodes.c"
             // Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
             // None on failure.
             assert(PyTuple_CheckExact(names));
             attrs = match_class(tstate, subject, type, oparg, names);
-            #line 1710 "Python/executor_cases.c.h"
+            #line 1722 "Python/executor_cases.c.h"
             Py_DECREF(subject);
             Py_DECREF(type);
             Py_DECREF(names);
-            #line 2322 "Python/bytecodes.c"
+            #line 2323 "Python/bytecodes.c"
             if (attrs) {
                 assert(PyTuple_CheckExact(attrs));  // Success!
             }
@@ -1718,7 +1730,7 @@
                 if (_PyErr_Occurred(tstate)) goto pop_3_error;
                 attrs = Py_None;  // Failure!
             }
-            #line 1722 "Python/executor_cases.c.h"
+            #line 1734 "Python/executor_cases.c.h"
             STACK_SHRINK(2);
             stack_pointer[-1] = attrs;
             break;
@@ -1727,10 +1739,10 @@
         case MATCH_MAPPING: {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2332 "Python/bytecodes.c"
+            #line 2333 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             res = match ? Py_True : Py_False;
-            #line 1734 "Python/executor_cases.c.h"
+            #line 1746 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1739,10 +1751,10 @@
         case MATCH_SEQUENCE: {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2337 "Python/bytecodes.c"
+            #line 2338 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             res = match ? Py_True : Py_False;
-            #line 1746 "Python/executor_cases.c.h"
+            #line 1758 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1752,11 +1764,11 @@
             PyObject *keys = stack_pointer[-1];
             PyObject *subject = stack_pointer[-2];
             PyObject *values_or_none;
-            #line 2342 "Python/bytecodes.c"
+            #line 2343 "Python/bytecodes.c"
             // On successful match, PUSH(values). Otherwise, PUSH(None).
             values_or_none = match_keys(tstate, subject, keys);
             if (values_or_none == NULL) goto error;
-            #line 1760 "Python/executor_cases.c.h"
+            #line 1772 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = values_or_none;
             break;
@@ -1765,14 +1777,14 @@
         case GET_ITER: {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2348 "Python/bytecodes.c"
+            #line 2349 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             iter = PyObject_GetIter(iterable);
-            #line 1772 "Python/executor_cases.c.h"
+            #line 1784 "Python/executor_cases.c.h"
             Py_DECREF(iterable);
-            #line 2351 "Python/bytecodes.c"
+            #line 2352 "Python/bytecodes.c"
             if (iter == NULL) goto pop_1_error;
-            #line 1776 "Python/executor_cases.c.h"
+            #line 1788 "Python/executor_cases.c.h"
             stack_pointer[-1] = iter;
             break;
         }
@@ -1780,7 +1792,7 @@
         case GET_YIELD_FROM_ITER: {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2355 "Python/bytecodes.c"
+            #line 2356 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             if (PyCoro_CheckExact(iterable)) {
                 /* `iterable` is a coroutine */
@@ -1803,11 +1815,11 @@
                 if (iter == NULL) {
                     goto error;
                 }
-            #line 1807 "Python/executor_cases.c.h"
+            #line 1819 "Python/executor_cases.c.h"
                 Py_DECREF(iterable);
-            #line 2378 "Python/bytecodes.c"
+            #line 2379 "Python/bytecodes.c"
             }
-            #line 1811 "Python/executor_cases.c.h"
+            #line 1823 "Python/executor_cases.c.h"
             stack_pointer[-1] = iter;
             break;
         }
@@ -1815,7 +1827,7 @@
         case FOR_ITER_LIST: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2458 "Python/bytecodes.c"
+            #line 2459 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -1836,7 +1848,7 @@
             // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 1840 "Python/executor_cases.c.h"
+            #line 1852 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1845,7 +1857,7 @@
         case FOR_ITER_TUPLE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2481 "Python/bytecodes.c"
+            #line 2482 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1866,7 +1878,7 @@
             // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 1870 "Python/executor_cases.c.h"
+            #line 1882 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1875,7 +1887,7 @@
         case FOR_ITER_RANGE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2504 "Python/bytecodes.c"
+            #line 2505 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1894,7 +1906,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 1898 "Python/executor_cases.c.h"
+            #line 1910 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1905,7 +1917,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2610 "Python/bytecodes.c"
+            #line 2611 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -1926,7 +1938,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 1930 "Python/executor_cases.c.h"
+            #line 1942 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1935,7 +1947,7 @@
         case PUSH_EXC_INFO: {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2649 "Python/bytecodes.c"
+            #line 2650 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -1945,7 +1957,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 1949 "Python/executor_cases.c.h"
+            #line 1961 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -1954,7 +1966,7 @@
 
         case EXIT_INIT_CHECK: {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3019 "Python/bytecodes.c"
+            #line 3020 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -1962,7 +1974,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 1966 "Python/executor_cases.c.h"
+            #line 1978 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
@@ -1970,7 +1982,7 @@
         case MAKE_FUNCTION: {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3433 "Python/bytecodes.c"
+            #line 3434 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -1982,7 +1994,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 1986 "Python/executor_cases.c.h"
+            #line 1998 "Python/executor_cases.c.h"
             stack_pointer[-1] = func;
             break;
         }
@@ -1990,7 +2002,7 @@
         case SET_FUNCTION_ATTRIBUTE: {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3447 "Python/bytecodes.c"
+            #line 3448 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -2015,7 +2027,7 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 2019 "Python/executor_cases.c.h"
+            #line 2031 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             break;
@@ -2026,15 +2038,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3497 "Python/bytecodes.c"
+            #line 3498 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 2032 "Python/executor_cases.c.h"
+            #line 2044 "Python/executor_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3499 "Python/bytecodes.c"
+            #line 3500 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 2038 "Python/executor_cases.c.h"
+            #line 2050 "Python/executor_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -2044,14 +2056,14 @@
         case CONVERT_VALUE: {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3503 "Python/bytecodes.c"
+            #line 3504 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 2055 "Python/executor_cases.c.h"
+            #line 2067 "Python/executor_cases.c.h"
             stack_pointer[-1] = result;
             break;
         }
@@ -2059,7 +2071,7 @@
         case FORMAT_SIMPLE: {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3512 "Python/bytecodes.c"
+            #line 3513 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -2070,7 +2082,7 @@
             else {
                 res = value;
             }
-            #line 2074 "Python/executor_cases.c.h"
+            #line 2086 "Python/executor_cases.c.h"
             stack_pointer[-1] = res;
             break;
         }
@@ -2079,12 +2091,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3525 "Python/bytecodes.c"
+            #line 3526 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 2088 "Python/executor_cases.c.h"
+            #line 2100 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             break;
@@ -2093,10 +2105,10 @@
         case COPY: {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3532 "Python/bytecodes.c"
+            #line 3533 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 2100 "Python/executor_cases.c.h"
+            #line 2112 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             break;
@@ -2105,9 +2117,9 @@
         case SWAP: {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3557 "Python/bytecodes.c"
+            #line 3558 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 2111 "Python/executor_cases.c.h"
+            #line 2123 "Python/executor_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             break;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 4f3257423a55f9..28d7ba79b342d6 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3182,12 +3182,12 @@
         TARGET(JUMP_BACKWARD) {
             #line 2226 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
+            #if ENABLE_SPECIALIZATION
             _Py_CODEUNIT *here = next_instr - 1;
             assert(oparg <= INSTR_OFFSET());
-            JUMPBY(1-oparg);
-            #if ENABLE_SPECIALIZATION
             here[1].cache += (1 << OPTIMIZER_BITS_IN_COUNTER);
             if (here[1].cache > tstate->interp->optimizer_backedge_threshold) {
+                JUMPBY(1 - oparg);
                 OBJECT_STAT_INC(optimization_attempts);
                 frame = _PyOptimizer_BackEdge(frame, here, next_instr, stack_pointer);
                 if (frame == NULL) {
@@ -3199,12 +3199,12 @@
                 goto resume_frame;
             }
             #endif  /* ENABLE_SPECIALIZATION */
-            #line 3203 "Python/generated_cases.c.h"
-            DISPATCH();
+            JUMP_POP_DISPATCH(1 - oparg, 0);
+            #line 3204 "Python/generated_cases.c.h"
         }
 
         TARGET(ENTER_EXECUTOR) {
-            #line 2257 "Python/bytecodes.c"
+            #line 2258 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
 
             PyCodeObject *code = _PyFrame_GetCode(frame);
@@ -3224,7 +3224,7 @@
 
         TARGET(POP_JUMP_IF_FALSE) {
             PyObject *cond = stack_pointer[-1];
-            #line 2274 "Python/bytecodes.c"
+            #line 2275 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
             JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
             #line 3231 "Python/generated_cases.c.h"
@@ -3232,7 +3232,7 @@
 
         TARGET(POP_JUMP_IF_TRUE) {
             PyObject *cond = stack_pointer[-1];
-            #line 2279 "Python/bytecodes.c"
+            #line 2280 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
             JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
             #line 3239 "Python/generated_cases.c.h"
@@ -3240,11 +3240,11 @@
 
         TARGET(POP_JUMP_IF_NOT_NONE) {
             PyObject *value = stack_pointer[-1];
-            #line 2284 "Python/bytecodes.c"
+            #line 2285 "Python/bytecodes.c"
             if (!Py_IsNone(value)) {
             #line 3246 "Python/generated_cases.c.h"
                 Py_DECREF(value);
-            #line 2286 "Python/bytecodes.c"
+            #line 2287 "Python/bytecodes.c"
                 JUMP_POP_DISPATCH(oparg, 1);
             }
             #line 3251 "Python/generated_cases.c.h"
@@ -3254,14 +3254,14 @@
 
         TARGET(POP_JUMP_IF_NONE) {
             PyObject *value = stack_pointer[-1];
-            #line 2291 "Python/bytecodes.c"
+            #line 2292 "Python/bytecodes.c"
             if (Py_IsNone(value)) {
                 JUMP_POP_DISPATCH(oparg, 1);
             }
             else {
             #line 3263 "Python/generated_cases.c.h"
                 Py_DECREF(value);
-            #line 2296 "Python/bytecodes.c"
+            #line 2297 "Python/bytecodes.c"
             }
             #line 3267 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
@@ -3269,27 +3269,26 @@
         }
 
         TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
-            #line 2300 "Python/bytecodes.c"
+            #line 2301 "Python/bytecodes.c"
             /* This bytecode is used in the `yield from` or `await` loop.
              * If there is an interrupt, we want it handled in the innermost
              * generator or coroutine, so we deliberately do not check it here.
              * (see bpo-30039).
              */
-            JUMPBY(-oparg);
+            JUMP_POP_DISPATCH(-oparg, 0);
             #line 3280 "Python/generated_cases.c.h"
-            DISPATCH();
         }
 
         TARGET(GET_LEN) {
             PyObject *obj = stack_pointer[-1];
             PyObject *len_o;
-            #line 2309 "Python/bytecodes.c"
+            #line 2310 "Python/bytecodes.c"
             // PUSH(len(TOS))
             Py_ssize_t len_i = PyObject_Length(obj);
             if (len_i < 0) goto error;
             len_o = PyLong_FromSsize_t(len_i);
             if (len_o == NULL) goto error;
-            #line 3293 "Python/generated_cases.c.h"
+            #line 3292 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = len_o;
             DISPATCH();
@@ -3300,16 +3299,16 @@
             PyObject *type = stack_pointer[-2];
             PyObject *subject = stack_pointer[-3];
             PyObject *attrs;
-            #line 2317 "Python/bytecodes.c"
+            #line 2318 "Python/bytecodes.c"
             // Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
             // None on failure.
             assert(PyTuple_CheckExact(names));
             attrs = match_class(tstate, subject, type, oparg, names);
-            #line 3309 "Python/generated_cases.c.h"
+            #line 3308 "Python/generated_cases.c.h"
             Py_DECREF(subject);
             Py_DECREF(type);
             Py_DECREF(names);
-            #line 2322 "Python/bytecodes.c"
+            #line 2323 "Python/bytecodes.c"
             if (attrs) {
                 assert(PyTuple_CheckExact(attrs));  // Success!
             }
@@ -3317,7 +3316,7 @@
                 if (_PyErr_Occurred(tstate)) goto pop_3_error;
                 attrs = Py_None;  // Failure!
             }
-            #line 3321 "Python/generated_cases.c.h"
+            #line 3320 "Python/generated_cases.c.h"
             STACK_SHRINK(2);
             stack_pointer[-1] = attrs;
             DISPATCH();
@@ -3326,10 +3325,10 @@
         TARGET(MATCH_MAPPING) {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2332 "Python/bytecodes.c"
+            #line 2333 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             res = match ? Py_True : Py_False;
-            #line 3333 "Python/generated_cases.c.h"
+            #line 3332 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3338,10 +3337,10 @@
         TARGET(MATCH_SEQUENCE) {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2337 "Python/bytecodes.c"
+            #line 2338 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             res = match ? Py_True : Py_False;
-            #line 3345 "Python/generated_cases.c.h"
+            #line 3344 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3351,11 +3350,11 @@
             PyObject *keys = stack_pointer[-1];
             PyObject *subject = stack_pointer[-2];
             PyObject *values_or_none;
-            #line 2342 "Python/bytecodes.c"
+            #line 2343 "Python/bytecodes.c"
             // On successful match, PUSH(values). Otherwise, PUSH(None).
             values_or_none = match_keys(tstate, subject, keys);
             if (values_or_none == NULL) goto error;
-            #line 3359 "Python/generated_cases.c.h"
+            #line 3358 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = values_or_none;
             DISPATCH();
@@ -3364,14 +3363,14 @@
         TARGET(GET_ITER) {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2348 "Python/bytecodes.c"
+            #line 2349 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             iter = PyObject_GetIter(iterable);
-            #line 3371 "Python/generated_cases.c.h"
+            #line 3370 "Python/generated_cases.c.h"
             Py_DECREF(iterable);
-            #line 2351 "Python/bytecodes.c"
+            #line 2352 "Python/bytecodes.c"
             if (iter == NULL) goto pop_1_error;
-            #line 3375 "Python/generated_cases.c.h"
+            #line 3374 "Python/generated_cases.c.h"
             stack_pointer[-1] = iter;
             DISPATCH();
         }
@@ -3379,7 +3378,7 @@
         TARGET(GET_YIELD_FROM_ITER) {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2355 "Python/bytecodes.c"
+            #line 2356 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             if (PyCoro_CheckExact(iterable)) {
                 /* `iterable` is a coroutine */
@@ -3402,11 +3401,11 @@
                 if (iter == NULL) {
                     goto error;
                 }
-            #line 3406 "Python/generated_cases.c.h"
+            #line 3405 "Python/generated_cases.c.h"
                 Py_DECREF(iterable);
-            #line 2378 "Python/bytecodes.c"
+            #line 2379 "Python/bytecodes.c"
             }
-            #line 3410 "Python/generated_cases.c.h"
+            #line 3409 "Python/generated_cases.c.h"
             stack_pointer[-1] = iter;
             DISPATCH();
         }
@@ -3416,7 +3415,7 @@
             static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2396 "Python/bytecodes.c"
+            #line 2397 "Python/bytecodes.c"
             #if ENABLE_SPECIALIZATION
             _PyForIterCache *cache = (_PyForIterCache *)next_instr;
             if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3448,7 +3447,7 @@
                 // DISPATCH();
             }
             // Common case: no jump, leave it to the code generator
-            #line 3452 "Python/generated_cases.c.h"
+            #line 3451 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3456,7 +3455,7 @@
         }
 
         TARGET(INSTRUMENTED_FOR_ITER) {
-            #line 2430 "Python/bytecodes.c"
+            #line 2431 "Python/bytecodes.c"
             _Py_CODEUNIT *here = next_instr-1;
             _Py_CODEUNIT *target;
             PyObject *iter = TOP();
@@ -3482,14 +3481,14 @@
                 target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
             }
             INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
-            #line 3486 "Python/generated_cases.c.h"
+            #line 3485 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(FOR_ITER_LIST) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2458 "Python/bytecodes.c"
+            #line 2459 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -3510,7 +3509,7 @@
             // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 3514 "Python/generated_cases.c.h"
+            #line 3513 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3520,7 +3519,7 @@
         TARGET(FOR_ITER_TUPLE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2481 "Python/bytecodes.c"
+            #line 2482 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3541,7 +3540,7 @@
             // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 3545 "Python/generated_cases.c.h"
+            #line 3544 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3551,7 +3550,7 @@
         TARGET(FOR_ITER_RANGE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2504 "Python/bytecodes.c"
+            #line 2505 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3570,7 +3569,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 3574 "Python/generated_cases.c.h"
+            #line 3573 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3579,7 +3578,7 @@
 
         TARGET(FOR_ITER_GEN) {
             PyObject *iter = stack_pointer[-1];
-            #line 2525 "Python/bytecodes.c"
+            #line 2526 "Python/bytecodes.c"
             DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
             PyGenObject *gen = (PyGenObject *)iter;
             DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3595,14 +3594,14 @@
             assert(next_instr[oparg].op.code == END_FOR ||
                    next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
             DISPATCH_INLINED(gen_frame);
-            #line 3599 "Python/generated_cases.c.h"
+            #line 3598 "Python/generated_cases.c.h"
         }
 
         TARGET(BEFORE_ASYNC_WITH) {
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2543 "Python/bytecodes.c"
+            #line 2544 "Python/bytecodes.c"
             PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
             if (enter == NULL) {
                 if (!_PyErr_Occurred(tstate)) {
@@ -3625,16 +3624,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3629 "Python/generated_cases.c.h"
+            #line 3628 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2566 "Python/bytecodes.c"
+            #line 2567 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3638 "Python/generated_cases.c.h"
+            #line 3637 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3645,7 +3644,7 @@
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2575 "Python/bytecodes.c"
+            #line 2576 "Python/bytecodes.c"
             /* pop the context manager, push its __exit__ and the
              * value returned from calling its __enter__
              */
@@ -3671,16 +3670,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3675 "Python/generated_cases.c.h"
+            #line 3674 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2601 "Python/bytecodes.c"
+            #line 2602 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3684 "Python/generated_cases.c.h"
+            #line 3683 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3692,7 +3691,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2610 "Python/bytecodes.c"
+            #line 2611 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -3713,7 +3712,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 3717 "Python/generated_cases.c.h"
+            #line 3716 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3722,7 +3721,7 @@
         TARGET(PUSH_EXC_INFO) {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2649 "Python/bytecodes.c"
+            #line 2650 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -3732,7 +3731,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 3736 "Python/generated_cases.c.h"
+            #line 3735 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -3746,7 +3745,7 @@
             uint32_t type_version = read_u32(&next_instr[1].cache);
             uint32_t keys_version = read_u32(&next_instr[3].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2661 "Python/bytecodes.c"
+            #line 2662 "Python/bytecodes.c"
             /* Cached method object */
             PyTypeObject *self_cls = Py_TYPE(self);
             assert(type_version != 0);
@@ -3763,7 +3762,7 @@
             assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
             res = self;
             assert(oparg & 1);
-            #line 3767 "Python/generated_cases.c.h"
+            #line 3766 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3777,7 +3776,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2680 "Python/bytecodes.c"
+            #line 2681 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             assert(self_cls->tp_dictoffset == 0);
@@ -3787,7 +3786,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3791 "Python/generated_cases.c.h"
+            #line 3790 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3801,7 +3800,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2692 "Python/bytecodes.c"
+            #line 2693 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             Py_ssize_t dictoffset = self_cls->tp_dictoffset;
@@ -3815,7 +3814,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3819 "Python/generated_cases.c.h"
+            #line 3818 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3824,16 +3823,16 @@
         }
 
         TARGET(KW_NAMES) {
-            #line 2708 "Python/bytecodes.c"
+            #line 2709 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
             kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
-            #line 3832 "Python/generated_cases.c.h"
+            #line 3831 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_CALL) {
-            #line 2714 "Python/bytecodes.c"
+            #line 2715 "Python/bytecodes.c"
             int is_meth = PEEK(oparg+2) != NULL;
             int total_args = oparg + is_meth;
             PyObject *function = PEEK(total_args + 1);
@@ -3846,7 +3845,7 @@
             _PyCallCache *cache = (_PyCallCache *)next_instr;
             INCREMENT_ADAPTIVE_COUNTER(cache->counter);
             GO_TO_INSTRUCTION(CALL);
-            #line 3850 "Python/generated_cases.c.h"
+            #line 3849 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL) {
@@ -3856,7 +3855,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2760 "Python/bytecodes.c"
+            #line 2761 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -3938,7 +3937,7 @@
                 Py_DECREF(args[i]);
             }
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 3942 "Python/generated_cases.c.h"
+            #line 3941 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -3950,7 +3949,7 @@
         TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 2848 "Python/bytecodes.c"
+            #line 2849 "Python/bytecodes.c"
             DEOPT_IF(method != NULL, CALL);
             DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
             STAT_INC(CALL, hit);
@@ -3960,7 +3959,7 @@
             PEEK(oparg + 2) = Py_NewRef(meth);  // method
             Py_DECREF(callable);
             GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
-            #line 3964 "Python/generated_cases.c.h"
+            #line 3963 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_EXACT_ARGS) {
@@ -3969,7 +3968,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2860 "Python/bytecodes.c"
+            #line 2861 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -3995,7 +3994,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 3999 "Python/generated_cases.c.h"
+            #line 3998 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -4003,7 +4002,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2888 "Python/bytecodes.c"
+            #line 2889 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -4039,7 +4038,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4043 "Python/generated_cases.c.h"
+            #line 4042 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_TYPE_1) {
@@ -4047,7 +4046,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2926 "Python/bytecodes.c"
+            #line 2927 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4057,7 +4056,7 @@
             res = Py_NewRef(Py_TYPE(obj));
             Py_DECREF(obj);
             Py_DECREF(&PyType_Type);  // I.e., callable
-            #line 4061 "Python/generated_cases.c.h"
+            #line 4060 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4070,7 +4069,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2938 "Python/bytecodes.c"
+            #line 2939 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4081,7 +4080,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyUnicode_Type);  // I.e., callable
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4085 "Python/generated_cases.c.h"
+            #line 4084 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4095,7 +4094,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2952 "Python/bytecodes.c"
+            #line 2953 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4106,7 +4105,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyTuple_Type);  // I.e., tuple
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4110 "Python/generated_cases.c.h"
+            #line 4109 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4119,7 +4118,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
-            #line 2966 "Python/bytecodes.c"
+            #line 2967 "Python/bytecodes.c"
             /* This instruction does the following:
              * 1. Creates the object (by calling ``object.__new__``)
              * 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
@@ -4170,12 +4169,12 @@
              * as it will be checked after start_frame */
             tstate->py_recursion_remaining--;
             goto start_frame;
-            #line 4174 "Python/generated_cases.c.h"
+            #line 4173 "Python/generated_cases.c.h"
         }
 
         TARGET(EXIT_INIT_CHECK) {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3019 "Python/bytecodes.c"
+            #line 3020 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -4183,7 +4182,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 4187 "Python/generated_cases.c.h"
+            #line 4186 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -4193,7 +4192,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3029 "Python/bytecodes.c"
+            #line 3030 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4215,7 +4214,7 @@
             }
             Py_DECREF(tp);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4219 "Python/generated_cases.c.h"
+            #line 4218 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4229,7 +4228,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3054 "Python/bytecodes.c"
+            #line 3055 "Python/bytecodes.c"
             /* Builtin METH_O functions */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4257,7 +4256,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4261 "Python/generated_cases.c.h"
+            #line 4260 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4271,7 +4270,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3085 "Python/bytecodes.c"
+            #line 3086 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL functions, without keywords */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4303,7 +4302,7 @@
                    'invalid'). In those cases an exception is set, so we must
                    handle it.
                 */
-            #line 4307 "Python/generated_cases.c.h"
+            #line 4306 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4317,7 +4316,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3120 "Python/bytecodes.c"
+            #line 3121 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL | METH_KEYWORDS functions */
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4349,7 +4348,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4353 "Python/generated_cases.c.h"
+            #line 4352 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4363,7 +4362,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3155 "Python/bytecodes.c"
+            #line 3156 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* len(o) */
             int is_meth = method != NULL;
@@ -4388,7 +4387,7 @@
             Py_DECREF(callable);
             Py_DECREF(arg);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4392 "Python/generated_cases.c.h"
+            #line 4391 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4401,7 +4400,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3182 "Python/bytecodes.c"
+            #line 3183 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* isinstance(o, o2) */
             int is_meth = method != NULL;
@@ -4428,7 +4427,7 @@
             Py_DECREF(cls);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4432 "Python/generated_cases.c.h"
+            #line 4431 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4440,7 +4439,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *self = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 3212 "Python/bytecodes.c"
+            #line 3213 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             assert(method != NULL);
@@ -4458,14 +4457,14 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
             assert(next_instr[-1].op.code == POP_TOP);
             DISPATCH();
-            #line 4462 "Python/generated_cases.c.h"
+            #line 4461 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3232 "Python/bytecodes.c"
+            #line 3233 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4496,7 +4495,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4500 "Python/generated_cases.c.h"
+            #line 4499 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4509,7 +4508,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3266 "Python/bytecodes.c"
+            #line 3267 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4538,7 +4537,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4542 "Python/generated_cases.c.h"
+            #line 4541 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4551,7 +4550,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3298 "Python/bytecodes.c"
+            #line 3299 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 0 || oparg == 1);
             int is_meth = method != NULL;
@@ -4580,7 +4579,7 @@
             Py_DECREF(self);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4584 "Python/generated_cases.c.h"
+            #line 4583 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4593,7 +4592,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3330 "Python/bytecodes.c"
+            #line 3331 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4621,7 +4620,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4625 "Python/generated_cases.c.h"
+            #line 4624 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4631,9 +4630,9 @@
         }
 
         TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
-            #line 3361 "Python/bytecodes.c"
+            #line 3362 "Python/bytecodes.c"
             GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
-            #line 4637 "Python/generated_cases.c.h"
+            #line 4636 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_FUNCTION_EX) {
@@ -4642,7 +4641,7 @@
             PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
             PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
             PyObject *result;
-            #line 3365 "Python/bytecodes.c"
+            #line 3366 "Python/bytecodes.c"
             // DICT_MERGE is called before this opcode if there are kwargs.
             // It converts all dict subtypes in kwargs into regular dicts.
             assert(kwargs == NULL || PyDict_CheckExact(kwargs));
@@ -4704,14 +4703,14 @@
                 }
                 result = PyObject_Call(func, callargs, kwargs);
             }
-            #line 4708 "Python/generated_cases.c.h"
+            #line 4707 "Python/generated_cases.c.h"
             Py_DECREF(func);
             Py_DECREF(callargs);
             Py_XDECREF(kwargs);
-            #line 3427 "Python/bytecodes.c"
+            #line 3428 "Python/bytecodes.c"
             assert(PEEK(3 + (oparg & 1)) == NULL);
             if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
-            #line 4715 "Python/generated_cases.c.h"
+            #line 4714 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg & 1) ? 1 : 0));
             STACK_SHRINK(2);
             stack_pointer[-1] = result;
@@ -4722,7 +4721,7 @@
         TARGET(MAKE_FUNCTION) {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3433 "Python/bytecodes.c"
+            #line 3434 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -4734,7 +4733,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 4738 "Python/generated_cases.c.h"
+            #line 4737 "Python/generated_cases.c.h"
             stack_pointer[-1] = func;
             DISPATCH();
         }
@@ -4742,7 +4741,7 @@
         TARGET(SET_FUNCTION_ATTRIBUTE) {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3447 "Python/bytecodes.c"
+            #line 3448 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -4767,14 +4766,14 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 4771 "Python/generated_cases.c.h"
+            #line 4770 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             DISPATCH();
         }
 
         TARGET(RETURN_GENERATOR) {
-            #line 3474 "Python/bytecodes.c"
+            #line 3475 "Python/bytecodes.c"
             assert(PyFunction_Check(frame->f_funcobj));
             PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
             PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4795,7 +4794,7 @@
             frame = cframe.current_frame = prev;
             _PyFrame_StackPush(frame, (PyObject *)gen);
             goto resume_frame;
-            #line 4799 "Python/generated_cases.c.h"
+            #line 4798 "Python/generated_cases.c.h"
         }
 
         TARGET(BUILD_SLICE) {
@@ -4803,15 +4802,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3497 "Python/bytecodes.c"
+            #line 3498 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 4809 "Python/generated_cases.c.h"
+            #line 4808 "Python/generated_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3499 "Python/bytecodes.c"
+            #line 3500 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 4815 "Python/generated_cases.c.h"
+            #line 4814 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -4821,14 +4820,14 @@
         TARGET(CONVERT_VALUE) {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3503 "Python/bytecodes.c"
+            #line 3504 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 4832 "Python/generated_cases.c.h"
+            #line 4831 "Python/generated_cases.c.h"
             stack_pointer[-1] = result;
             DISPATCH();
         }
@@ -4836,7 +4835,7 @@
         TARGET(FORMAT_SIMPLE) {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3512 "Python/bytecodes.c"
+            #line 3513 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -4847,7 +4846,7 @@
             else {
                 res = value;
             }
-            #line 4851 "Python/generated_cases.c.h"
+            #line 4850 "Python/generated_cases.c.h"
             stack_pointer[-1] = res;
             DISPATCH();
         }
@@ -4856,12 +4855,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3525 "Python/bytecodes.c"
+            #line 3526 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 4865 "Python/generated_cases.c.h"
+            #line 4864 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -4870,10 +4869,10 @@
         TARGET(COPY) {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3532 "Python/bytecodes.c"
+            #line 3533 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 4877 "Python/generated_cases.c.h"
+            #line 4876 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             DISPATCH();
@@ -4885,7 +4884,7 @@
             PyObject *rhs = stack_pointer[-1];
             PyObject *lhs = stack_pointer[-2];
             PyObject *res;
-            #line 3537 "Python/bytecodes.c"
+            #line 3538 "Python/bytecodes.c"
             #if ENABLE_SPECIALIZATION
             _PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
             if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4900,12 +4899,12 @@
             assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
             assert(binary_ops[oparg]);
             res = binary_ops[oparg](lhs, rhs);
-            #line 4904 "Python/generated_cases.c.h"
+            #line 4903 "Python/generated_cases.c.h"
             Py_DECREF(lhs);
             Py_DECREF(rhs);
-            #line 3552 "Python/bytecodes.c"
+            #line 3553 "Python/bytecodes.c"
             if (res == NULL) goto pop_2_error;
-            #line 4909 "Python/generated_cases.c.h"
+            #line 4908 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             next_instr += 1;
@@ -4915,16 +4914,16 @@
         TARGET(SWAP) {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3557 "Python/bytecodes.c"
+            #line 3558 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 4921 "Python/generated_cases.c.h"
+            #line 4920 "Python/generated_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_INSTRUCTION) {
-            #line 3561 "Python/bytecodes.c"
+            #line 3562 "Python/bytecodes.c"
             int next_opcode = _Py_call_instrumentation_instruction(
                 tstate, frame, next_instr-1);
             if (next_opcode < 0) goto error;
@@ -4936,48 +4935,48 @@
             assert(next_opcode > 0 && next_opcode < 256);
             opcode = next_opcode;
             DISPATCH_GOTO();
-            #line 4940 "Python/generated_cases.c.h"
+            #line 4939 "Python/generated_cases.c.h"
         }
 
         TARGET(INSTRUMENTED_JUMP_FORWARD) {
-            #line 3575 "Python/bytecodes.c"
+            #line 3576 "Python/bytecodes.c"
             INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4946 "Python/generated_cases.c.h"
+            #line 4945 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_JUMP_BACKWARD) {
-            #line 3579 "Python/bytecodes.c"
+            #line 3580 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
             INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4954 "Python/generated_cases.c.h"
+            #line 4953 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
-            #line 3584 "Python/bytecodes.c"
+            #line 3585 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsTrue(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4965 "Python/generated_cases.c.h"
+            #line 4964 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
-            #line 3592 "Python/bytecodes.c"
+            #line 3593 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsFalse(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4976 "Python/generated_cases.c.h"
+            #line 4975 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
-            #line 3600 "Python/bytecodes.c"
+            #line 3601 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -4989,12 +4988,12 @@
                 offset = 0;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4993 "Python/generated_cases.c.h"
+            #line 4992 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
-            #line 3614 "Python/bytecodes.c"
+            #line 3615 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -5006,30 +5005,30 @@
                 offset = oparg;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 5010 "Python/generated_cases.c.h"
+            #line 5009 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(EXTENDED_ARG) {
-            #line 3628 "Python/bytecodes.c"
+            #line 3629 "Python/bytecodes.c"
             assert(oparg);
             opcode = next_instr->op.code;
             oparg = oparg << 8 | next_instr->op.arg;
             PRE_DISPATCH_GOTO();
             DISPATCH_GOTO();
-            #line 5021 "Python/generated_cases.c.h"
+            #line 5020 "Python/generated_cases.c.h"
         }
 
         TARGET(CACHE) {
-            #line 3636 "Python/bytecodes.c"
+            #line 3637 "Python/bytecodes.c"
             assert(0 && "Executing a cache.");
             Py_UNREACHABLE();
-            #line 5028 "Python/generated_cases.c.h"
+            #line 5027 "Python/generated_cases.c.h"
         }
 
         TARGET(RESERVED) {
-            #line 3641 "Python/bytecodes.c"
+            #line 3642 "Python/bytecodes.c"
             assert(0 && "Executing RESERVED instruction.");
             Py_UNREACHABLE();
-            #line 5035 "Python/generated_cases.c.h"
+            #line 5034 "Python/generated_cases.c.h"
         }
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 88eb8a388016f0..ab9ddff92c0b09 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -1249,6 +1249,7 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
     [POP_JUMP_IF_TRUE] = { .nuops = 1, .uops = { { POP_JUMP_IF_TRUE, 0, 0 } } },
     [POP_JUMP_IF_NOT_NONE] = { .nuops = 1, .uops = { { POP_JUMP_IF_NOT_NONE, 0, 0 } } },
     [POP_JUMP_IF_NONE] = { .nuops = 1, .uops = { { POP_JUMP_IF_NONE, 0, 0 } } },
+    [JUMP_BACKWARD_NO_INTERRUPT] = { .nuops = 1, .uops = { { JUMP_BACKWARD_NO_INTERRUPT, 0, 0 } } },
     [GET_LEN] = { .nuops = 1, .uops = { { GET_LEN, 0, 0 } } },
     [MATCH_CLASS] = { .nuops = 1, .uops = { { MATCH_CLASS, 0, 0 } } },
     [MATCH_MAPPING] = { .nuops = 1, .uops = { { MATCH_MAPPING, 0, 0 } } },

From 28b3951b4b4a8039ca4f0ee01b76b4772182903b Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 13:29:40 -0700
Subject: [PATCH 3/9] Replace ENTER_EXECUTOR with the original in trace
 projection

---
 Python/optimizer.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Python/optimizer.c b/Python/optimizer.c
index db117bb180c1c8..931a2726da2d43 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -419,6 +419,12 @@ translate_bytecode_to_trace(
             opcode = instr->op.code;
             operand = (operand << 8) | instr->op.arg;
         }
+        if (opcode == ENTER_EXECUTOR) {
+            _PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[operand&255];
+            opcode = executor->vm_data.opcode;
+            DPRINTF(2, "  * ENTER_EXECUTOR -> %s\n",  _PyOpcode_OpName[opcode]);
+            operand = (operand & 0xffffff00) | executor->vm_data.oparg;
+        }
         switch (opcode) {
             case LOAD_FAST_LOAD_FAST:
             case STORE_FAST_LOAD_FAST:

From 0825696ffaac8ad46da80beea49c337c248d2c38 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 14:34:50 -0700
Subject: [PATCH 4/9] Make POP_JUMP_IF_FALSE/TRUE conditionally jump

This may destroy the symmetry or slow things down,
but (for now) it's needed so that the executor can
at least avoid bailing when the jump is not taken.
(The original code was doing a jump 0 in that case.)
---
 Python/bytecodes.c         |   8 +-
 Python/executor_cases.c.h  | 136 ++++++++--------
 Python/generated_cases.c.h | 326 +++++++++++++++++++------------------
 3 files changed, 244 insertions(+), 226 deletions(-)

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 9b55b8decea274..a009fbc8076706 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2273,12 +2273,16 @@ dummy_func(
 
         inst(POP_JUMP_IF_FALSE, (cond -- )) {
             assert(PyBool_Check(cond));
-            JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
+            if (Py_IsFalse(cond)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
         }
 
         inst(POP_JUMP_IF_TRUE, (cond -- )) {
             assert(PyBool_Check(cond));
-            JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
+            if (Py_IsTrue(cond)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
         }
 
         inst(POP_JUMP_IF_NOT_NONE, (value -- )) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index b40efe00a8bd17..afd88fb9d1eaff 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1637,72 +1637,78 @@
             PyObject *cond = stack_pointer[-1];
             #line 2275 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
-            JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
-            #line 1642 "Python/executor_cases.c.h"
+            if (Py_IsFalse(cond)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
+            #line 1644 "Python/executor_cases.c.h"
+            STACK_SHRINK(1);
             break;
         }
 
         case POP_JUMP_IF_TRUE: {
             PyObject *cond = stack_pointer[-1];
-            #line 2280 "Python/bytecodes.c"
+            #line 2282 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
-            JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
-            #line 1651 "Python/executor_cases.c.h"
+            if (Py_IsTrue(cond)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
+            #line 1656 "Python/executor_cases.c.h"
+            STACK_SHRINK(1);
             break;
         }
 
         case POP_JUMP_IF_NOT_NONE: {
             PyObject *value = stack_pointer[-1];
-            #line 2285 "Python/bytecodes.c"
+            #line 2289 "Python/bytecodes.c"
             if (!Py_IsNone(value)) {
-            #line 1659 "Python/executor_cases.c.h"
+            #line 1665 "Python/executor_cases.c.h"
                 Py_DECREF(value);
-            #line 2287 "Python/bytecodes.c"
+            #line 2291 "Python/bytecodes.c"
                 JUMP_POP_DISPATCH(oparg, 1);
             }
-            #line 1664 "Python/executor_cases.c.h"
+            #line 1670 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
 
         case POP_JUMP_IF_NONE: {
             PyObject *value = stack_pointer[-1];
-            #line 2292 "Python/bytecodes.c"
+            #line 2296 "Python/bytecodes.c"
             if (Py_IsNone(value)) {
                 JUMP_POP_DISPATCH(oparg, 1);
             }
             else {
-            #line 1676 "Python/executor_cases.c.h"
+            #line 1682 "Python/executor_cases.c.h"
                 Py_DECREF(value);
-            #line 2297 "Python/bytecodes.c"
+            #line 2301 "Python/bytecodes.c"
             }
-            #line 1680 "Python/executor_cases.c.h"
+            #line 1686 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
 
         case JUMP_BACKWARD_NO_INTERRUPT: {
-            #line 2301 "Python/bytecodes.c"
+            #line 2305 "Python/bytecodes.c"
             /* This bytecode is used in the `yield from` or `await` loop.
              * If there is an interrupt, we want it handled in the innermost
              * generator or coroutine, so we deliberately do not check it here.
              * (see bpo-30039).
              */
             JUMP_POP_DISPATCH(-oparg, 0);
-            #line 1693 "Python/executor_cases.c.h"
+            #line 1699 "Python/executor_cases.c.h"
             break;
         }
 
         case GET_LEN: {
             PyObject *obj = stack_pointer[-1];
             PyObject *len_o;
-            #line 2310 "Python/bytecodes.c"
+            #line 2314 "Python/bytecodes.c"
             // PUSH(len(TOS))
             Py_ssize_t len_i = PyObject_Length(obj);
             if (len_i < 0) goto error;
             len_o = PyLong_FromSsize_t(len_i);
             if (len_o == NULL) goto error;
-            #line 1706 "Python/executor_cases.c.h"
+            #line 1712 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = len_o;
             break;
@@ -1713,16 +1719,16 @@
             PyObject *type = stack_pointer[-2];
             PyObject *subject = stack_pointer[-3];
             PyObject *attrs;
-            #line 2318 "Python/bytecodes.c"
+            #line 2322 "Python/bytecodes.c"
             // Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
             // None on failure.
             assert(PyTuple_CheckExact(names));
             attrs = match_class(tstate, subject, type, oparg, names);
-            #line 1722 "Python/executor_cases.c.h"
+            #line 1728 "Python/executor_cases.c.h"
             Py_DECREF(subject);
             Py_DECREF(type);
             Py_DECREF(names);
-            #line 2323 "Python/bytecodes.c"
+            #line 2327 "Python/bytecodes.c"
             if (attrs) {
                 assert(PyTuple_CheckExact(attrs));  // Success!
             }
@@ -1730,7 +1736,7 @@
                 if (_PyErr_Occurred(tstate)) goto pop_3_error;
                 attrs = Py_None;  // Failure!
             }
-            #line 1734 "Python/executor_cases.c.h"
+            #line 1740 "Python/executor_cases.c.h"
             STACK_SHRINK(2);
             stack_pointer[-1] = attrs;
             break;
@@ -1739,10 +1745,10 @@
         case MATCH_MAPPING: {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2333 "Python/bytecodes.c"
+            #line 2337 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             res = match ? Py_True : Py_False;
-            #line 1746 "Python/executor_cases.c.h"
+            #line 1752 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1751,10 +1757,10 @@
         case MATCH_SEQUENCE: {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2338 "Python/bytecodes.c"
+            #line 2342 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             res = match ? Py_True : Py_False;
-            #line 1758 "Python/executor_cases.c.h"
+            #line 1764 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1764,11 +1770,11 @@
             PyObject *keys = stack_pointer[-1];
             PyObject *subject = stack_pointer[-2];
             PyObject *values_or_none;
-            #line 2343 "Python/bytecodes.c"
+            #line 2347 "Python/bytecodes.c"
             // On successful match, PUSH(values). Otherwise, PUSH(None).
             values_or_none = match_keys(tstate, subject, keys);
             if (values_or_none == NULL) goto error;
-            #line 1772 "Python/executor_cases.c.h"
+            #line 1778 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = values_or_none;
             break;
@@ -1777,14 +1783,14 @@
         case GET_ITER: {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2349 "Python/bytecodes.c"
+            #line 2353 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             iter = PyObject_GetIter(iterable);
-            #line 1784 "Python/executor_cases.c.h"
+            #line 1790 "Python/executor_cases.c.h"
             Py_DECREF(iterable);
-            #line 2352 "Python/bytecodes.c"
+            #line 2356 "Python/bytecodes.c"
             if (iter == NULL) goto pop_1_error;
-            #line 1788 "Python/executor_cases.c.h"
+            #line 1794 "Python/executor_cases.c.h"
             stack_pointer[-1] = iter;
             break;
         }
@@ -1792,7 +1798,7 @@
         case GET_YIELD_FROM_ITER: {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2356 "Python/bytecodes.c"
+            #line 2360 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             if (PyCoro_CheckExact(iterable)) {
                 /* `iterable` is a coroutine */
@@ -1815,11 +1821,11 @@
                 if (iter == NULL) {
                     goto error;
                 }
-            #line 1819 "Python/executor_cases.c.h"
+            #line 1825 "Python/executor_cases.c.h"
                 Py_DECREF(iterable);
-            #line 2379 "Python/bytecodes.c"
+            #line 2383 "Python/bytecodes.c"
             }
-            #line 1823 "Python/executor_cases.c.h"
+            #line 1829 "Python/executor_cases.c.h"
             stack_pointer[-1] = iter;
             break;
         }
@@ -1827,7 +1833,7 @@
         case FOR_ITER_LIST: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2459 "Python/bytecodes.c"
+            #line 2463 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -1848,7 +1854,7 @@
             // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 1852 "Python/executor_cases.c.h"
+            #line 1858 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1857,7 +1863,7 @@
         case FOR_ITER_TUPLE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2482 "Python/bytecodes.c"
+            #line 2486 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1878,7 +1884,7 @@
             // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 1882 "Python/executor_cases.c.h"
+            #line 1888 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1887,7 +1893,7 @@
         case FOR_ITER_RANGE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2505 "Python/bytecodes.c"
+            #line 2509 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1906,7 +1912,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 1910 "Python/executor_cases.c.h"
+            #line 1916 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1917,7 +1923,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2611 "Python/bytecodes.c"
+            #line 2615 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -1938,7 +1944,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 1942 "Python/executor_cases.c.h"
+            #line 1948 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1947,7 +1953,7 @@
         case PUSH_EXC_INFO: {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2650 "Python/bytecodes.c"
+            #line 2654 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -1957,7 +1963,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 1961 "Python/executor_cases.c.h"
+            #line 1967 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -1966,7 +1972,7 @@
 
         case EXIT_INIT_CHECK: {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3020 "Python/bytecodes.c"
+            #line 3024 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -1974,7 +1980,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 1978 "Python/executor_cases.c.h"
+            #line 1984 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
@@ -1982,7 +1988,7 @@
         case MAKE_FUNCTION: {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3434 "Python/bytecodes.c"
+            #line 3438 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -1994,7 +2000,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 1998 "Python/executor_cases.c.h"
+            #line 2004 "Python/executor_cases.c.h"
             stack_pointer[-1] = func;
             break;
         }
@@ -2002,7 +2008,7 @@
         case SET_FUNCTION_ATTRIBUTE: {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3448 "Python/bytecodes.c"
+            #line 3452 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -2027,7 +2033,7 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 2031 "Python/executor_cases.c.h"
+            #line 2037 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             break;
@@ -2038,15 +2044,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3498 "Python/bytecodes.c"
+            #line 3502 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 2044 "Python/executor_cases.c.h"
+            #line 2050 "Python/executor_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3500 "Python/bytecodes.c"
+            #line 3504 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 2050 "Python/executor_cases.c.h"
+            #line 2056 "Python/executor_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -2056,14 +2062,14 @@
         case CONVERT_VALUE: {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3504 "Python/bytecodes.c"
+            #line 3508 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 2067 "Python/executor_cases.c.h"
+            #line 2073 "Python/executor_cases.c.h"
             stack_pointer[-1] = result;
             break;
         }
@@ -2071,7 +2077,7 @@
         case FORMAT_SIMPLE: {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3513 "Python/bytecodes.c"
+            #line 3517 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -2082,7 +2088,7 @@
             else {
                 res = value;
             }
-            #line 2086 "Python/executor_cases.c.h"
+            #line 2092 "Python/executor_cases.c.h"
             stack_pointer[-1] = res;
             break;
         }
@@ -2091,12 +2097,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3526 "Python/bytecodes.c"
+            #line 3530 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 2100 "Python/executor_cases.c.h"
+            #line 2106 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             break;
@@ -2105,10 +2111,10 @@
         case COPY: {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3533 "Python/bytecodes.c"
+            #line 3537 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 2112 "Python/executor_cases.c.h"
+            #line 2118 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             break;
@@ -2117,9 +2123,9 @@
         case SWAP: {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3558 "Python/bytecodes.c"
+            #line 3562 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 2123 "Python/executor_cases.c.h"
+            #line 2129 "Python/executor_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             break;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 28d7ba79b342d6..65952f829bce73 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3226,69 +3226,77 @@
             PyObject *cond = stack_pointer[-1];
             #line 2275 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
-            JUMP_POP_DISPATCH(oparg * Py_IsFalse(cond), 1);
-            #line 3231 "Python/generated_cases.c.h"
+            if (Py_IsFalse(cond)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
+            #line 3233 "Python/generated_cases.c.h"
+            STACK_SHRINK(1);
+            DISPATCH();
         }
 
         TARGET(POP_JUMP_IF_TRUE) {
             PyObject *cond = stack_pointer[-1];
-            #line 2280 "Python/bytecodes.c"
+            #line 2282 "Python/bytecodes.c"
             assert(PyBool_Check(cond));
-            JUMP_POP_DISPATCH(oparg * Py_IsTrue(cond), 1);
-            #line 3239 "Python/generated_cases.c.h"
+            if (Py_IsTrue(cond)) {
+                JUMP_POP_DISPATCH(oparg, 1);
+            }
+            #line 3245 "Python/generated_cases.c.h"
+            STACK_SHRINK(1);
+            DISPATCH();
         }
 
         TARGET(POP_JUMP_IF_NOT_NONE) {
             PyObject *value = stack_pointer[-1];
-            #line 2285 "Python/bytecodes.c"
+            #line 2289 "Python/bytecodes.c"
             if (!Py_IsNone(value)) {
-            #line 3246 "Python/generated_cases.c.h"
+            #line 3254 "Python/generated_cases.c.h"
                 Py_DECREF(value);
-            #line 2287 "Python/bytecodes.c"
+            #line 2291 "Python/bytecodes.c"
                 JUMP_POP_DISPATCH(oparg, 1);
             }
-            #line 3251 "Python/generated_cases.c.h"
+            #line 3259 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
 
         TARGET(POP_JUMP_IF_NONE) {
             PyObject *value = stack_pointer[-1];
-            #line 2292 "Python/bytecodes.c"
+            #line 2296 "Python/bytecodes.c"
             if (Py_IsNone(value)) {
                 JUMP_POP_DISPATCH(oparg, 1);
             }
             else {
-            #line 3263 "Python/generated_cases.c.h"
+            #line 3271 "Python/generated_cases.c.h"
                 Py_DECREF(value);
-            #line 2297 "Python/bytecodes.c"
+            #line 2301 "Python/bytecodes.c"
             }
-            #line 3267 "Python/generated_cases.c.h"
+            #line 3275 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
 
         TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
-            #line 2301 "Python/bytecodes.c"
+            #line 2305 "Python/bytecodes.c"
             /* This bytecode is used in the `yield from` or `await` loop.
              * If there is an interrupt, we want it handled in the innermost
              * generator or coroutine, so we deliberately do not check it here.
              * (see bpo-30039).
              */
             JUMP_POP_DISPATCH(-oparg, 0);
-            #line 3280 "Python/generated_cases.c.h"
+            #line 3288 "Python/generated_cases.c.h"
         }
 
         TARGET(GET_LEN) {
             PyObject *obj = stack_pointer[-1];
             PyObject *len_o;
-            #line 2310 "Python/bytecodes.c"
+            #line 2314 "Python/bytecodes.c"
             // PUSH(len(TOS))
             Py_ssize_t len_i = PyObject_Length(obj);
             if (len_i < 0) goto error;
             len_o = PyLong_FromSsize_t(len_i);
             if (len_o == NULL) goto error;
-            #line 3292 "Python/generated_cases.c.h"
+            #line 3300 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = len_o;
             DISPATCH();
@@ -3299,16 +3307,16 @@
             PyObject *type = stack_pointer[-2];
             PyObject *subject = stack_pointer[-3];
             PyObject *attrs;
-            #line 2318 "Python/bytecodes.c"
+            #line 2322 "Python/bytecodes.c"
             // Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
             // None on failure.
             assert(PyTuple_CheckExact(names));
             attrs = match_class(tstate, subject, type, oparg, names);
-            #line 3308 "Python/generated_cases.c.h"
+            #line 3316 "Python/generated_cases.c.h"
             Py_DECREF(subject);
             Py_DECREF(type);
             Py_DECREF(names);
-            #line 2323 "Python/bytecodes.c"
+            #line 2327 "Python/bytecodes.c"
             if (attrs) {
                 assert(PyTuple_CheckExact(attrs));  // Success!
             }
@@ -3316,7 +3324,7 @@
                 if (_PyErr_Occurred(tstate)) goto pop_3_error;
                 attrs = Py_None;  // Failure!
             }
-            #line 3320 "Python/generated_cases.c.h"
+            #line 3328 "Python/generated_cases.c.h"
             STACK_SHRINK(2);
             stack_pointer[-1] = attrs;
             DISPATCH();
@@ -3325,10 +3333,10 @@
         TARGET(MATCH_MAPPING) {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2333 "Python/bytecodes.c"
+            #line 2337 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
             res = match ? Py_True : Py_False;
-            #line 3332 "Python/generated_cases.c.h"
+            #line 3340 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3337,10 +3345,10 @@
         TARGET(MATCH_SEQUENCE) {
             PyObject *subject = stack_pointer[-1];
             PyObject *res;
-            #line 2338 "Python/bytecodes.c"
+            #line 2342 "Python/bytecodes.c"
             int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
             res = match ? Py_True : Py_False;
-            #line 3344 "Python/generated_cases.c.h"
+            #line 3352 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3350,11 +3358,11 @@
             PyObject *keys = stack_pointer[-1];
             PyObject *subject = stack_pointer[-2];
             PyObject *values_or_none;
-            #line 2343 "Python/bytecodes.c"
+            #line 2347 "Python/bytecodes.c"
             // On successful match, PUSH(values). Otherwise, PUSH(None).
             values_or_none = match_keys(tstate, subject, keys);
             if (values_or_none == NULL) goto error;
-            #line 3358 "Python/generated_cases.c.h"
+            #line 3366 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = values_or_none;
             DISPATCH();
@@ -3363,14 +3371,14 @@
         TARGET(GET_ITER) {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2349 "Python/bytecodes.c"
+            #line 2353 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             iter = PyObject_GetIter(iterable);
-            #line 3370 "Python/generated_cases.c.h"
+            #line 3378 "Python/generated_cases.c.h"
             Py_DECREF(iterable);
-            #line 2352 "Python/bytecodes.c"
+            #line 2356 "Python/bytecodes.c"
             if (iter == NULL) goto pop_1_error;
-            #line 3374 "Python/generated_cases.c.h"
+            #line 3382 "Python/generated_cases.c.h"
             stack_pointer[-1] = iter;
             DISPATCH();
         }
@@ -3378,7 +3386,7 @@
         TARGET(GET_YIELD_FROM_ITER) {
             PyObject *iterable = stack_pointer[-1];
             PyObject *iter;
-            #line 2356 "Python/bytecodes.c"
+            #line 2360 "Python/bytecodes.c"
             /* before: [obj]; after [getiter(obj)] */
             if (PyCoro_CheckExact(iterable)) {
                 /* `iterable` is a coroutine */
@@ -3401,11 +3409,11 @@
                 if (iter == NULL) {
                     goto error;
                 }
-            #line 3405 "Python/generated_cases.c.h"
+            #line 3413 "Python/generated_cases.c.h"
                 Py_DECREF(iterable);
-            #line 2379 "Python/bytecodes.c"
+            #line 2383 "Python/bytecodes.c"
             }
-            #line 3409 "Python/generated_cases.c.h"
+            #line 3417 "Python/generated_cases.c.h"
             stack_pointer[-1] = iter;
             DISPATCH();
         }
@@ -3415,7 +3423,7 @@
             static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2397 "Python/bytecodes.c"
+            #line 2401 "Python/bytecodes.c"
             #if ENABLE_SPECIALIZATION
             _PyForIterCache *cache = (_PyForIterCache *)next_instr;
             if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3447,7 +3455,7 @@
                 // DISPATCH();
             }
             // Common case: no jump, leave it to the code generator
-            #line 3451 "Python/generated_cases.c.h"
+            #line 3459 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3455,7 +3463,7 @@
         }
 
         TARGET(INSTRUMENTED_FOR_ITER) {
-            #line 2431 "Python/bytecodes.c"
+            #line 2435 "Python/bytecodes.c"
             _Py_CODEUNIT *here = next_instr-1;
             _Py_CODEUNIT *target;
             PyObject *iter = TOP();
@@ -3481,14 +3489,14 @@
                 target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
             }
             INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
-            #line 3485 "Python/generated_cases.c.h"
+            #line 3493 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(FOR_ITER_LIST) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2459 "Python/bytecodes.c"
+            #line 2463 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -3509,7 +3517,7 @@
             // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 3513 "Python/generated_cases.c.h"
+            #line 3521 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3519,7 +3527,7 @@
         TARGET(FOR_ITER_TUPLE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2482 "Python/bytecodes.c"
+            #line 2486 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3540,7 +3548,7 @@
             // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 3544 "Python/generated_cases.c.h"
+            #line 3552 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3550,7 +3558,7 @@
         TARGET(FOR_ITER_RANGE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2505 "Python/bytecodes.c"
+            #line 2509 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3569,7 +3577,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 3573 "Python/generated_cases.c.h"
+            #line 3581 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3578,7 +3586,7 @@
 
         TARGET(FOR_ITER_GEN) {
             PyObject *iter = stack_pointer[-1];
-            #line 2526 "Python/bytecodes.c"
+            #line 2530 "Python/bytecodes.c"
             DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
             PyGenObject *gen = (PyGenObject *)iter;
             DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3594,14 +3602,14 @@
             assert(next_instr[oparg].op.code == END_FOR ||
                    next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
             DISPATCH_INLINED(gen_frame);
-            #line 3598 "Python/generated_cases.c.h"
+            #line 3606 "Python/generated_cases.c.h"
         }
 
         TARGET(BEFORE_ASYNC_WITH) {
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2544 "Python/bytecodes.c"
+            #line 2548 "Python/bytecodes.c"
             PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
             if (enter == NULL) {
                 if (!_PyErr_Occurred(tstate)) {
@@ -3624,16 +3632,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3628 "Python/generated_cases.c.h"
+            #line 3636 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2567 "Python/bytecodes.c"
+            #line 2571 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3637 "Python/generated_cases.c.h"
+            #line 3645 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3644,7 +3652,7 @@
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2576 "Python/bytecodes.c"
+            #line 2580 "Python/bytecodes.c"
             /* pop the context manager, push its __exit__ and the
              * value returned from calling its __enter__
              */
@@ -3670,16 +3678,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3674 "Python/generated_cases.c.h"
+            #line 3682 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2602 "Python/bytecodes.c"
+            #line 2606 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3683 "Python/generated_cases.c.h"
+            #line 3691 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3691,7 +3699,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2611 "Python/bytecodes.c"
+            #line 2615 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -3712,7 +3720,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 3716 "Python/generated_cases.c.h"
+            #line 3724 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3721,7 +3729,7 @@
         TARGET(PUSH_EXC_INFO) {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2650 "Python/bytecodes.c"
+            #line 2654 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -3731,7 +3739,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 3735 "Python/generated_cases.c.h"
+            #line 3743 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -3745,7 +3753,7 @@
             uint32_t type_version = read_u32(&next_instr[1].cache);
             uint32_t keys_version = read_u32(&next_instr[3].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2662 "Python/bytecodes.c"
+            #line 2666 "Python/bytecodes.c"
             /* Cached method object */
             PyTypeObject *self_cls = Py_TYPE(self);
             assert(type_version != 0);
@@ -3762,7 +3770,7 @@
             assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
             res = self;
             assert(oparg & 1);
-            #line 3766 "Python/generated_cases.c.h"
+            #line 3774 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3776,7 +3784,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2681 "Python/bytecodes.c"
+            #line 2685 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             assert(self_cls->tp_dictoffset == 0);
@@ -3786,7 +3794,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3790 "Python/generated_cases.c.h"
+            #line 3798 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3800,7 +3808,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2693 "Python/bytecodes.c"
+            #line 2697 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             Py_ssize_t dictoffset = self_cls->tp_dictoffset;
@@ -3814,7 +3822,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3818 "Python/generated_cases.c.h"
+            #line 3826 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3823,16 +3831,16 @@
         }
 
         TARGET(KW_NAMES) {
-            #line 2709 "Python/bytecodes.c"
+            #line 2713 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
             kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
-            #line 3831 "Python/generated_cases.c.h"
+            #line 3839 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_CALL) {
-            #line 2715 "Python/bytecodes.c"
+            #line 2719 "Python/bytecodes.c"
             int is_meth = PEEK(oparg+2) != NULL;
             int total_args = oparg + is_meth;
             PyObject *function = PEEK(total_args + 1);
@@ -3845,7 +3853,7 @@
             _PyCallCache *cache = (_PyCallCache *)next_instr;
             INCREMENT_ADAPTIVE_COUNTER(cache->counter);
             GO_TO_INSTRUCTION(CALL);
-            #line 3849 "Python/generated_cases.c.h"
+            #line 3857 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL) {
@@ -3855,7 +3863,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2761 "Python/bytecodes.c"
+            #line 2765 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -3937,7 +3945,7 @@
                 Py_DECREF(args[i]);
             }
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 3941 "Python/generated_cases.c.h"
+            #line 3949 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -3949,7 +3957,7 @@
         TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 2849 "Python/bytecodes.c"
+            #line 2853 "Python/bytecodes.c"
             DEOPT_IF(method != NULL, CALL);
             DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
             STAT_INC(CALL, hit);
@@ -3959,7 +3967,7 @@
             PEEK(oparg + 2) = Py_NewRef(meth);  // method
             Py_DECREF(callable);
             GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
-            #line 3963 "Python/generated_cases.c.h"
+            #line 3971 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_EXACT_ARGS) {
@@ -3968,7 +3976,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2861 "Python/bytecodes.c"
+            #line 2865 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -3994,7 +4002,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 3998 "Python/generated_cases.c.h"
+            #line 4006 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -4002,7 +4010,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2889 "Python/bytecodes.c"
+            #line 2893 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -4038,7 +4046,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4042 "Python/generated_cases.c.h"
+            #line 4050 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_TYPE_1) {
@@ -4046,7 +4054,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2927 "Python/bytecodes.c"
+            #line 2931 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4056,7 +4064,7 @@
             res = Py_NewRef(Py_TYPE(obj));
             Py_DECREF(obj);
             Py_DECREF(&PyType_Type);  // I.e., callable
-            #line 4060 "Python/generated_cases.c.h"
+            #line 4068 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4069,7 +4077,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2939 "Python/bytecodes.c"
+            #line 2943 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4080,7 +4088,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyUnicode_Type);  // I.e., callable
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4084 "Python/generated_cases.c.h"
+            #line 4092 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4094,7 +4102,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2953 "Python/bytecodes.c"
+            #line 2957 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4105,7 +4113,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyTuple_Type);  // I.e., tuple
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4109 "Python/generated_cases.c.h"
+            #line 4117 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4118,7 +4126,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
-            #line 2967 "Python/bytecodes.c"
+            #line 2971 "Python/bytecodes.c"
             /* This instruction does the following:
              * 1. Creates the object (by calling ``object.__new__``)
              * 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
@@ -4169,12 +4177,12 @@
              * as it will be checked after start_frame */
             tstate->py_recursion_remaining--;
             goto start_frame;
-            #line 4173 "Python/generated_cases.c.h"
+            #line 4181 "Python/generated_cases.c.h"
         }
 
         TARGET(EXIT_INIT_CHECK) {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3020 "Python/bytecodes.c"
+            #line 3024 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -4182,7 +4190,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 4186 "Python/generated_cases.c.h"
+            #line 4194 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -4192,7 +4200,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3030 "Python/bytecodes.c"
+            #line 3034 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4214,7 +4222,7 @@
             }
             Py_DECREF(tp);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4218 "Python/generated_cases.c.h"
+            #line 4226 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4228,7 +4236,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3055 "Python/bytecodes.c"
+            #line 3059 "Python/bytecodes.c"
             /* Builtin METH_O functions */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4256,7 +4264,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4260 "Python/generated_cases.c.h"
+            #line 4268 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4270,7 +4278,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3086 "Python/bytecodes.c"
+            #line 3090 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL functions, without keywords */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4302,7 +4310,7 @@
                    'invalid'). In those cases an exception is set, so we must
                    handle it.
                 */
-            #line 4306 "Python/generated_cases.c.h"
+            #line 4314 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4316,7 +4324,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3121 "Python/bytecodes.c"
+            #line 3125 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL | METH_KEYWORDS functions */
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4348,7 +4356,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4352 "Python/generated_cases.c.h"
+            #line 4360 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4362,7 +4370,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3156 "Python/bytecodes.c"
+            #line 3160 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* len(o) */
             int is_meth = method != NULL;
@@ -4387,7 +4395,7 @@
             Py_DECREF(callable);
             Py_DECREF(arg);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4391 "Python/generated_cases.c.h"
+            #line 4399 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4400,7 +4408,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3183 "Python/bytecodes.c"
+            #line 3187 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* isinstance(o, o2) */
             int is_meth = method != NULL;
@@ -4427,7 +4435,7 @@
             Py_DECREF(cls);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4431 "Python/generated_cases.c.h"
+            #line 4439 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4439,7 +4447,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *self = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 3213 "Python/bytecodes.c"
+            #line 3217 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             assert(method != NULL);
@@ -4457,14 +4465,14 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
             assert(next_instr[-1].op.code == POP_TOP);
             DISPATCH();
-            #line 4461 "Python/generated_cases.c.h"
+            #line 4469 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3233 "Python/bytecodes.c"
+            #line 3237 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4495,7 +4503,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4499 "Python/generated_cases.c.h"
+            #line 4507 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4508,7 +4516,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3267 "Python/bytecodes.c"
+            #line 3271 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4537,7 +4545,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4541 "Python/generated_cases.c.h"
+            #line 4549 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4550,7 +4558,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3299 "Python/bytecodes.c"
+            #line 3303 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 0 || oparg == 1);
             int is_meth = method != NULL;
@@ -4579,7 +4587,7 @@
             Py_DECREF(self);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4583 "Python/generated_cases.c.h"
+            #line 4591 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4592,7 +4600,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3331 "Python/bytecodes.c"
+            #line 3335 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4620,7 +4628,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4624 "Python/generated_cases.c.h"
+            #line 4632 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4630,9 +4638,9 @@
         }
 
         TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
-            #line 3362 "Python/bytecodes.c"
+            #line 3366 "Python/bytecodes.c"
             GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
-            #line 4636 "Python/generated_cases.c.h"
+            #line 4644 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_FUNCTION_EX) {
@@ -4641,7 +4649,7 @@
             PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
             PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
             PyObject *result;
-            #line 3366 "Python/bytecodes.c"
+            #line 3370 "Python/bytecodes.c"
             // DICT_MERGE is called before this opcode if there are kwargs.
             // It converts all dict subtypes in kwargs into regular dicts.
             assert(kwargs == NULL || PyDict_CheckExact(kwargs));
@@ -4703,14 +4711,14 @@
                 }
                 result = PyObject_Call(func, callargs, kwargs);
             }
-            #line 4707 "Python/generated_cases.c.h"
+            #line 4715 "Python/generated_cases.c.h"
             Py_DECREF(func);
             Py_DECREF(callargs);
             Py_XDECREF(kwargs);
-            #line 3428 "Python/bytecodes.c"
+            #line 3432 "Python/bytecodes.c"
             assert(PEEK(3 + (oparg & 1)) == NULL);
             if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
-            #line 4714 "Python/generated_cases.c.h"
+            #line 4722 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg & 1) ? 1 : 0));
             STACK_SHRINK(2);
             stack_pointer[-1] = result;
@@ -4721,7 +4729,7 @@
         TARGET(MAKE_FUNCTION) {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3434 "Python/bytecodes.c"
+            #line 3438 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -4733,7 +4741,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 4737 "Python/generated_cases.c.h"
+            #line 4745 "Python/generated_cases.c.h"
             stack_pointer[-1] = func;
             DISPATCH();
         }
@@ -4741,7 +4749,7 @@
         TARGET(SET_FUNCTION_ATTRIBUTE) {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3448 "Python/bytecodes.c"
+            #line 3452 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -4766,14 +4774,14 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 4770 "Python/generated_cases.c.h"
+            #line 4778 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             DISPATCH();
         }
 
         TARGET(RETURN_GENERATOR) {
-            #line 3475 "Python/bytecodes.c"
+            #line 3479 "Python/bytecodes.c"
             assert(PyFunction_Check(frame->f_funcobj));
             PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
             PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4794,7 +4802,7 @@
             frame = cframe.current_frame = prev;
             _PyFrame_StackPush(frame, (PyObject *)gen);
             goto resume_frame;
-            #line 4798 "Python/generated_cases.c.h"
+            #line 4806 "Python/generated_cases.c.h"
         }
 
         TARGET(BUILD_SLICE) {
@@ -4802,15 +4810,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3498 "Python/bytecodes.c"
+            #line 3502 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 4808 "Python/generated_cases.c.h"
+            #line 4816 "Python/generated_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3500 "Python/bytecodes.c"
+            #line 3504 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 4814 "Python/generated_cases.c.h"
+            #line 4822 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -4820,14 +4828,14 @@
         TARGET(CONVERT_VALUE) {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3504 "Python/bytecodes.c"
+            #line 3508 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 4831 "Python/generated_cases.c.h"
+            #line 4839 "Python/generated_cases.c.h"
             stack_pointer[-1] = result;
             DISPATCH();
         }
@@ -4835,7 +4843,7 @@
         TARGET(FORMAT_SIMPLE) {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3513 "Python/bytecodes.c"
+            #line 3517 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -4846,7 +4854,7 @@
             else {
                 res = value;
             }
-            #line 4850 "Python/generated_cases.c.h"
+            #line 4858 "Python/generated_cases.c.h"
             stack_pointer[-1] = res;
             DISPATCH();
         }
@@ -4855,12 +4863,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3526 "Python/bytecodes.c"
+            #line 3530 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 4864 "Python/generated_cases.c.h"
+            #line 4872 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -4869,10 +4877,10 @@
         TARGET(COPY) {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3533 "Python/bytecodes.c"
+            #line 3537 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 4876 "Python/generated_cases.c.h"
+            #line 4884 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             DISPATCH();
@@ -4884,7 +4892,7 @@
             PyObject *rhs = stack_pointer[-1];
             PyObject *lhs = stack_pointer[-2];
             PyObject *res;
-            #line 3538 "Python/bytecodes.c"
+            #line 3542 "Python/bytecodes.c"
             #if ENABLE_SPECIALIZATION
             _PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
             if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4899,12 +4907,12 @@
             assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
             assert(binary_ops[oparg]);
             res = binary_ops[oparg](lhs, rhs);
-            #line 4903 "Python/generated_cases.c.h"
+            #line 4911 "Python/generated_cases.c.h"
             Py_DECREF(lhs);
             Py_DECREF(rhs);
-            #line 3553 "Python/bytecodes.c"
+            #line 3557 "Python/bytecodes.c"
             if (res == NULL) goto pop_2_error;
-            #line 4908 "Python/generated_cases.c.h"
+            #line 4916 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             next_instr += 1;
@@ -4914,16 +4922,16 @@
         TARGET(SWAP) {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3558 "Python/bytecodes.c"
+            #line 3562 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 4920 "Python/generated_cases.c.h"
+            #line 4928 "Python/generated_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_INSTRUCTION) {
-            #line 3562 "Python/bytecodes.c"
+            #line 3566 "Python/bytecodes.c"
             int next_opcode = _Py_call_instrumentation_instruction(
                 tstate, frame, next_instr-1);
             if (next_opcode < 0) goto error;
@@ -4935,48 +4943,48 @@
             assert(next_opcode > 0 && next_opcode < 256);
             opcode = next_opcode;
             DISPATCH_GOTO();
-            #line 4939 "Python/generated_cases.c.h"
+            #line 4947 "Python/generated_cases.c.h"
         }
 
         TARGET(INSTRUMENTED_JUMP_FORWARD) {
-            #line 3576 "Python/bytecodes.c"
+            #line 3580 "Python/bytecodes.c"
             INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4945 "Python/generated_cases.c.h"
+            #line 4953 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_JUMP_BACKWARD) {
-            #line 3580 "Python/bytecodes.c"
+            #line 3584 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
             INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4953 "Python/generated_cases.c.h"
+            #line 4961 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
-            #line 3585 "Python/bytecodes.c"
+            #line 3589 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsTrue(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4964 "Python/generated_cases.c.h"
+            #line 4972 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
-            #line 3593 "Python/bytecodes.c"
+            #line 3597 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsFalse(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4975 "Python/generated_cases.c.h"
+            #line 4983 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
-            #line 3601 "Python/bytecodes.c"
+            #line 3605 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -4988,12 +4996,12 @@
                 offset = 0;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4992 "Python/generated_cases.c.h"
+            #line 5000 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
-            #line 3615 "Python/bytecodes.c"
+            #line 3619 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -5005,30 +5013,30 @@
                 offset = oparg;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 5009 "Python/generated_cases.c.h"
+            #line 5017 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(EXTENDED_ARG) {
-            #line 3629 "Python/bytecodes.c"
+            #line 3633 "Python/bytecodes.c"
             assert(oparg);
             opcode = next_instr->op.code;
             oparg = oparg << 8 | next_instr->op.arg;
             PRE_DISPATCH_GOTO();
             DISPATCH_GOTO();
-            #line 5020 "Python/generated_cases.c.h"
+            #line 5028 "Python/generated_cases.c.h"
         }
 
         TARGET(CACHE) {
-            #line 3637 "Python/bytecodes.c"
+            #line 3641 "Python/bytecodes.c"
             assert(0 && "Executing a cache.");
             Py_UNREACHABLE();
-            #line 5027 "Python/generated_cases.c.h"
+            #line 5035 "Python/generated_cases.c.h"
         }
 
         TARGET(RESERVED) {
-            #line 3642 "Python/bytecodes.c"
+            #line 3646 "Python/bytecodes.c"
             assert(0 && "Executing RESERVED instruction.");
             Py_UNREACHABLE();
-            #line 5034 "Python/generated_cases.c.h"
+            #line 5042 "Python/generated_cases.c.h"
         }

From 1df7b84b2af66ece787e878c0be649e23dbd7163 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 14:53:55 -0700
Subject: [PATCH 5/9] Implement JUMP_TO_TOP special uop

If JUMP_BACKWARD jumps to the start of the trace, add this.
It contains an eval breaker check.
---
 Python/ceval.c                          |  7 ++++
 Python/opcode_metadata.h                | 50 +++++++++++++------------
 Python/optimizer.c                      | 10 ++++-
 Tools/cases_generator/generate_cases.py |  1 +
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/Python/ceval.c b/Python/ceval.c
index 0d9401b4ac3fd5..66c015b1b46803 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2776,6 +2776,13 @@ _PyUopExecute(_PyExecutorObject *executor, _PyInterpreterFrame *frame, PyObject
 #define ENABLE_SPECIALIZATION 0
 #include "executor_cases.c.h"
 
+            case JUMP_TO_TOP:
+            {
+                pc = 0;
+                CHECK_EVAL_BREAKER();
+                break;
+            }
+
             case SAVE_IP:
             {
                 frame->prev_instr = ip_offset + oparg;
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index ab9ddff92c0b09..7d091b855e8c81 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -21,18 +21,19 @@
 
 #define EXIT_TRACE 300
 #define SAVE_IP 301
-#define _GUARD_BOTH_INT 302
-#define _BINARY_OP_MULTIPLY_INT 303
-#define _BINARY_OP_ADD_INT 304
-#define _BINARY_OP_SUBTRACT_INT 305
-#define _GUARD_BOTH_FLOAT 306
-#define _BINARY_OP_MULTIPLY_FLOAT 307
-#define _BINARY_OP_ADD_FLOAT 308
-#define _BINARY_OP_SUBTRACT_FLOAT 309
-#define _GUARD_BOTH_UNICODE 310
-#define _BINARY_OP_ADD_UNICODE 311
-#define _LOAD_LOCALS 312
-#define _LOAD_FROM_DICT_OR_GLOBALS 313
+#define JUMP_TO_TOP 302
+#define _GUARD_BOTH_INT 303
+#define _BINARY_OP_MULTIPLY_INT 304
+#define _BINARY_OP_ADD_INT 305
+#define _BINARY_OP_SUBTRACT_INT 306
+#define _GUARD_BOTH_FLOAT 307
+#define _BINARY_OP_MULTIPLY_FLOAT 308
+#define _BINARY_OP_ADD_FLOAT 309
+#define _BINARY_OP_SUBTRACT_FLOAT 310
+#define _GUARD_BOTH_UNICODE 311
+#define _BINARY_OP_ADD_UNICODE 312
+#define _LOAD_LOCALS 313
+#define _LOAD_FROM_DICT_OR_GLOBALS 314
 
 #ifndef NEED_OPCODE_METADATA
 extern int _PyOpcode_num_popped(int opcode, int oparg, bool jump);
@@ -1276,18 +1277,19 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
 const char * const _PyOpcode_uop_name[512] = {
     [300] = "EXIT_TRACE",
     [301] = "SAVE_IP",
-    [302] = "_GUARD_BOTH_INT",
-    [303] = "_BINARY_OP_MULTIPLY_INT",
-    [304] = "_BINARY_OP_ADD_INT",
-    [305] = "_BINARY_OP_SUBTRACT_INT",
-    [306] = "_GUARD_BOTH_FLOAT",
-    [307] = "_BINARY_OP_MULTIPLY_FLOAT",
-    [308] = "_BINARY_OP_ADD_FLOAT",
-    [309] = "_BINARY_OP_SUBTRACT_FLOAT",
-    [310] = "_GUARD_BOTH_UNICODE",
-    [311] = "_BINARY_OP_ADD_UNICODE",
-    [312] = "_LOAD_LOCALS",
-    [313] = "_LOAD_FROM_DICT_OR_GLOBALS",
+    [302] = "JUMP_TO_TOP",
+    [303] = "_GUARD_BOTH_INT",
+    [304] = "_BINARY_OP_MULTIPLY_INT",
+    [305] = "_BINARY_OP_ADD_INT",
+    [306] = "_BINARY_OP_SUBTRACT_INT",
+    [307] = "_GUARD_BOTH_FLOAT",
+    [308] = "_BINARY_OP_MULTIPLY_FLOAT",
+    [309] = "_BINARY_OP_ADD_FLOAT",
+    [310] = "_BINARY_OP_SUBTRACT_FLOAT",
+    [311] = "_GUARD_BOTH_UNICODE",
+    [312] = "_BINARY_OP_ADD_UNICODE",
+    [313] = "_LOAD_LOCALS",
+    [314] = "_LOAD_FROM_DICT_OR_GLOBALS",
 };
 #endif // NEED_OPCODE_METADATA
 #endif
diff --git a/Python/optimizer.c b/Python/optimizer.c
index 931a2726da2d43..822ada9fae6cd8 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -374,9 +374,7 @@ translate_bytecode_to_trace(
     _PyUOpInstruction *trace,
     int max_length)
 {
-#ifdef Py_DEBUG
     _Py_CODEUNIT *initial_instr = instr;
-#endif
     int trace_length = 0;
 
 #ifdef Py_DEBUG
@@ -455,6 +453,14 @@ translate_bytecode_to_trace(
                 }
                 break;
             }
+            case JUMP_BACKWARD:
+            {
+                if (instr + 2 - operand == initial_instr) {
+                    ADD_TO_TRACE(JUMP_TO_TOP, 0);
+                    break;
+                }
+                // Else fall through!
+            }
             default:
             {
                 const struct opcode_macro_expansion *expansion = &_PyOpcode_macro_expansion[opcode];
diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
index 9d5e14be3f5bc0..876b2d80345b85 100644
--- a/Tools/cases_generator/generate_cases.py
+++ b/Tools/cases_generator/generate_cases.py
@@ -1332,6 +1332,7 @@ def add(name: str) -> None:
             counter += 1
         add("EXIT_TRACE")
         add("SAVE_IP")
+        add("JUMP_TO_TOP")
         for instr in self.instrs.values():
             if instr.kind == "op" and instr.is_viable_uop():
                 add(instr.name)

From d6235ee51b83aaffd4ce6b4f70d725c49f7d149a Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 17:41:33 -0700
Subject: [PATCH 6/9] Cleanup some commented-out lines

---
 Python/bytecodes.c         |  12 --
 Python/executor_cases.c.h  |  69 +++++-----
 Python/generated_cases.c.h | 258 ++++++++++++++++++-------------------
 3 files changed, 153 insertions(+), 186 deletions(-)

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index a009fbc8076706..905ca36c6165ac 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2422,11 +2422,8 @@ dummy_func(
                 assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
                        next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
                 Py_DECREF(iter);
-                // STACK_SHRINK(1);
-                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
                 /* Jump forward oparg, then skip following END_FOR instruction */
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-                // DISPATCH();
             }
             // Common case: no jump, leave it to the code generator
         }
@@ -2473,11 +2470,8 @@ dummy_func(
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            // STACK_SHRINK(1);
-            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-            // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
         }
@@ -2496,11 +2490,8 @@ dummy_func(
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            // STACK_SHRINK(1);
-            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-            // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
         }
@@ -2512,10 +2503,7 @@ dummy_func(
             if (r->len <= 0) {
                 // STACK_SHRINK(1);
                 Py_DECREF(r);
-                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
-                // Jump over END_FOR instruction.
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-                // DISPATCH();
             }
             long value = r->start;
             r->start = value + r->step;
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index afd88fb9d1eaff..9d283dd6fefd39 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1833,7 +1833,7 @@
         case FOR_ITER_LIST: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2463 "Python/bytecodes.c"
+            #line 2460 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -1847,14 +1847,11 @@
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            // STACK_SHRINK(1);
-            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-            // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 1858 "Python/executor_cases.c.h"
+            #line 1855 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1863,7 +1860,7 @@
         case FOR_ITER_TUPLE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2486 "Python/bytecodes.c"
+            #line 2480 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1877,14 +1874,11 @@
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            // STACK_SHRINK(1);
-            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-            // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 1888 "Python/executor_cases.c.h"
+            #line 1882 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1893,17 +1887,14 @@
         case FOR_ITER_RANGE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2509 "Python/bytecodes.c"
+            #line 2500 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
             if (r->len <= 0) {
                 // STACK_SHRINK(1);
                 Py_DECREF(r);
-                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
-                // Jump over END_FOR instruction.
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-                // DISPATCH();
             }
             long value = r->start;
             r->start = value + r->step;
@@ -1912,7 +1903,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 1916 "Python/executor_cases.c.h"
+            #line 1907 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             break;
@@ -1923,7 +1914,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2615 "Python/bytecodes.c"
+            #line 2603 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -1944,7 +1935,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 1948 "Python/executor_cases.c.h"
+            #line 1939 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             break;
@@ -1953,7 +1944,7 @@
         case PUSH_EXC_INFO: {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2654 "Python/bytecodes.c"
+            #line 2642 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -1963,7 +1954,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 1967 "Python/executor_cases.c.h"
+            #line 1958 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -1972,7 +1963,7 @@
 
         case EXIT_INIT_CHECK: {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3024 "Python/bytecodes.c"
+            #line 3012 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -1980,7 +1971,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 1984 "Python/executor_cases.c.h"
+            #line 1975 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             break;
         }
@@ -1988,7 +1979,7 @@
         case MAKE_FUNCTION: {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3438 "Python/bytecodes.c"
+            #line 3426 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -2000,7 +1991,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 2004 "Python/executor_cases.c.h"
+            #line 1995 "Python/executor_cases.c.h"
             stack_pointer[-1] = func;
             break;
         }
@@ -2008,7 +1999,7 @@
         case SET_FUNCTION_ATTRIBUTE: {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3452 "Python/bytecodes.c"
+            #line 3440 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -2033,7 +2024,7 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 2037 "Python/executor_cases.c.h"
+            #line 2028 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             break;
@@ -2044,15 +2035,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3502 "Python/bytecodes.c"
+            #line 3490 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 2050 "Python/executor_cases.c.h"
+            #line 2041 "Python/executor_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3504 "Python/bytecodes.c"
+            #line 3492 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 2056 "Python/executor_cases.c.h"
+            #line 2047 "Python/executor_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -2062,14 +2053,14 @@
         case CONVERT_VALUE: {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3508 "Python/bytecodes.c"
+            #line 3496 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 2073 "Python/executor_cases.c.h"
+            #line 2064 "Python/executor_cases.c.h"
             stack_pointer[-1] = result;
             break;
         }
@@ -2077,7 +2068,7 @@
         case FORMAT_SIMPLE: {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3517 "Python/bytecodes.c"
+            #line 3505 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -2088,7 +2079,7 @@
             else {
                 res = value;
             }
-            #line 2092 "Python/executor_cases.c.h"
+            #line 2083 "Python/executor_cases.c.h"
             stack_pointer[-1] = res;
             break;
         }
@@ -2097,12 +2088,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3530 "Python/bytecodes.c"
+            #line 3518 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 2106 "Python/executor_cases.c.h"
+            #line 2097 "Python/executor_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             break;
@@ -2111,10 +2102,10 @@
         case COPY: {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3537 "Python/bytecodes.c"
+            #line 3525 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 2118 "Python/executor_cases.c.h"
+            #line 2109 "Python/executor_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             break;
@@ -2123,9 +2114,9 @@
         case SWAP: {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3562 "Python/bytecodes.c"
+            #line 3550 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 2129 "Python/executor_cases.c.h"
+            #line 2120 "Python/executor_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             break;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 65952f829bce73..70754de76ff1b3 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3448,14 +3448,11 @@
                 assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
                        next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
                 Py_DECREF(iter);
-                // STACK_SHRINK(1);
-                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
                 /* Jump forward oparg, then skip following END_FOR instruction */
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-                // DISPATCH();
             }
             // Common case: no jump, leave it to the code generator
-            #line 3459 "Python/generated_cases.c.h"
+            #line 3456 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3463,7 +3460,7 @@
         }
 
         TARGET(INSTRUMENTED_FOR_ITER) {
-            #line 2435 "Python/bytecodes.c"
+            #line 2432 "Python/bytecodes.c"
             _Py_CODEUNIT *here = next_instr-1;
             _Py_CODEUNIT *target;
             PyObject *iter = TOP();
@@ -3489,14 +3486,14 @@
                 target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
             }
             INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
-            #line 3493 "Python/generated_cases.c.h"
+            #line 3490 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(FOR_ITER_LIST) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2463 "Python/bytecodes.c"
+            #line 2460 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -3510,14 +3507,11 @@
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            // STACK_SHRINK(1);
-            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-            // DISPATCH();
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 3521 "Python/generated_cases.c.h"
+            #line 3515 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3527,7 +3521,7 @@
         TARGET(FOR_ITER_TUPLE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2486 "Python/bytecodes.c"
+            #line 2480 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3541,14 +3535,11 @@
                 Py_DECREF(seq);
             }
             Py_DECREF(iter);
-            // STACK_SHRINK(1);
-            // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
             /* Jump forward oparg, then skip following END_FOR instruction */
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-            // DISPATCH();
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 3552 "Python/generated_cases.c.h"
+            #line 3543 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3558,17 +3549,14 @@
         TARGET(FOR_ITER_RANGE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2509 "Python/bytecodes.c"
+            #line 2500 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
             if (r->len <= 0) {
                 // STACK_SHRINK(1);
                 Py_DECREF(r);
-                // SKIP_OVER(INLINE_CACHE_ENTRIES_FOR_ITER);
-                // Jump over END_FOR instruction.
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
-                // DISPATCH();
             }
             long value = r->start;
             r->start = value + r->step;
@@ -3577,7 +3565,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 3581 "Python/generated_cases.c.h"
+            #line 3569 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3586,7 +3574,7 @@
 
         TARGET(FOR_ITER_GEN) {
             PyObject *iter = stack_pointer[-1];
-            #line 2530 "Python/bytecodes.c"
+            #line 2518 "Python/bytecodes.c"
             DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
             PyGenObject *gen = (PyGenObject *)iter;
             DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3602,14 +3590,14 @@
             assert(next_instr[oparg].op.code == END_FOR ||
                    next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
             DISPATCH_INLINED(gen_frame);
-            #line 3606 "Python/generated_cases.c.h"
+            #line 3594 "Python/generated_cases.c.h"
         }
 
         TARGET(BEFORE_ASYNC_WITH) {
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2548 "Python/bytecodes.c"
+            #line 2536 "Python/bytecodes.c"
             PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
             if (enter == NULL) {
                 if (!_PyErr_Occurred(tstate)) {
@@ -3632,16 +3620,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3636 "Python/generated_cases.c.h"
+            #line 3624 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2571 "Python/bytecodes.c"
+            #line 2559 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3645 "Python/generated_cases.c.h"
+            #line 3633 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3652,7 +3640,7 @@
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2580 "Python/bytecodes.c"
+            #line 2568 "Python/bytecodes.c"
             /* pop the context manager, push its __exit__ and the
              * value returned from calling its __enter__
              */
@@ -3678,16 +3666,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3682 "Python/generated_cases.c.h"
+            #line 3670 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2606 "Python/bytecodes.c"
+            #line 2594 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3691 "Python/generated_cases.c.h"
+            #line 3679 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3699,7 +3687,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2615 "Python/bytecodes.c"
+            #line 2603 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -3720,7 +3708,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 3724 "Python/generated_cases.c.h"
+            #line 3712 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3729,7 +3717,7 @@
         TARGET(PUSH_EXC_INFO) {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2654 "Python/bytecodes.c"
+            #line 2642 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -3739,7 +3727,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 3743 "Python/generated_cases.c.h"
+            #line 3731 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -3753,7 +3741,7 @@
             uint32_t type_version = read_u32(&next_instr[1].cache);
             uint32_t keys_version = read_u32(&next_instr[3].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2666 "Python/bytecodes.c"
+            #line 2654 "Python/bytecodes.c"
             /* Cached method object */
             PyTypeObject *self_cls = Py_TYPE(self);
             assert(type_version != 0);
@@ -3770,7 +3758,7 @@
             assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
             res = self;
             assert(oparg & 1);
-            #line 3774 "Python/generated_cases.c.h"
+            #line 3762 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3784,7 +3772,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2685 "Python/bytecodes.c"
+            #line 2673 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             assert(self_cls->tp_dictoffset == 0);
@@ -3794,7 +3782,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3798 "Python/generated_cases.c.h"
+            #line 3786 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3808,7 +3796,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2697 "Python/bytecodes.c"
+            #line 2685 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             Py_ssize_t dictoffset = self_cls->tp_dictoffset;
@@ -3822,7 +3810,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3826 "Python/generated_cases.c.h"
+            #line 3814 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3831,16 +3819,16 @@
         }
 
         TARGET(KW_NAMES) {
-            #line 2713 "Python/bytecodes.c"
+            #line 2701 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
             kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
-            #line 3839 "Python/generated_cases.c.h"
+            #line 3827 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_CALL) {
-            #line 2719 "Python/bytecodes.c"
+            #line 2707 "Python/bytecodes.c"
             int is_meth = PEEK(oparg+2) != NULL;
             int total_args = oparg + is_meth;
             PyObject *function = PEEK(total_args + 1);
@@ -3853,7 +3841,7 @@
             _PyCallCache *cache = (_PyCallCache *)next_instr;
             INCREMENT_ADAPTIVE_COUNTER(cache->counter);
             GO_TO_INSTRUCTION(CALL);
-            #line 3857 "Python/generated_cases.c.h"
+            #line 3845 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL) {
@@ -3863,7 +3851,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2765 "Python/bytecodes.c"
+            #line 2753 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -3945,7 +3933,7 @@
                 Py_DECREF(args[i]);
             }
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 3949 "Python/generated_cases.c.h"
+            #line 3937 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -3957,7 +3945,7 @@
         TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 2853 "Python/bytecodes.c"
+            #line 2841 "Python/bytecodes.c"
             DEOPT_IF(method != NULL, CALL);
             DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
             STAT_INC(CALL, hit);
@@ -3967,7 +3955,7 @@
             PEEK(oparg + 2) = Py_NewRef(meth);  // method
             Py_DECREF(callable);
             GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
-            #line 3971 "Python/generated_cases.c.h"
+            #line 3959 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_EXACT_ARGS) {
@@ -3976,7 +3964,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2865 "Python/bytecodes.c"
+            #line 2853 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -4002,7 +3990,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4006 "Python/generated_cases.c.h"
+            #line 3994 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -4010,7 +3998,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2893 "Python/bytecodes.c"
+            #line 2881 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -4046,7 +4034,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4050 "Python/generated_cases.c.h"
+            #line 4038 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_TYPE_1) {
@@ -4054,7 +4042,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2931 "Python/bytecodes.c"
+            #line 2919 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4064,7 +4052,7 @@
             res = Py_NewRef(Py_TYPE(obj));
             Py_DECREF(obj);
             Py_DECREF(&PyType_Type);  // I.e., callable
-            #line 4068 "Python/generated_cases.c.h"
+            #line 4056 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4077,7 +4065,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2943 "Python/bytecodes.c"
+            #line 2931 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4088,7 +4076,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyUnicode_Type);  // I.e., callable
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4092 "Python/generated_cases.c.h"
+            #line 4080 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4102,7 +4090,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2957 "Python/bytecodes.c"
+            #line 2945 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4113,7 +4101,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyTuple_Type);  // I.e., tuple
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4117 "Python/generated_cases.c.h"
+            #line 4105 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4126,7 +4114,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
-            #line 2971 "Python/bytecodes.c"
+            #line 2959 "Python/bytecodes.c"
             /* This instruction does the following:
              * 1. Creates the object (by calling ``object.__new__``)
              * 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
@@ -4177,12 +4165,12 @@
              * as it will be checked after start_frame */
             tstate->py_recursion_remaining--;
             goto start_frame;
-            #line 4181 "Python/generated_cases.c.h"
+            #line 4169 "Python/generated_cases.c.h"
         }
 
         TARGET(EXIT_INIT_CHECK) {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3024 "Python/bytecodes.c"
+            #line 3012 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -4190,7 +4178,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 4194 "Python/generated_cases.c.h"
+            #line 4182 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -4200,7 +4188,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3034 "Python/bytecodes.c"
+            #line 3022 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4222,7 +4210,7 @@
             }
             Py_DECREF(tp);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4226 "Python/generated_cases.c.h"
+            #line 4214 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4236,7 +4224,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3059 "Python/bytecodes.c"
+            #line 3047 "Python/bytecodes.c"
             /* Builtin METH_O functions */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4264,7 +4252,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4268 "Python/generated_cases.c.h"
+            #line 4256 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4278,7 +4266,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3090 "Python/bytecodes.c"
+            #line 3078 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL functions, without keywords */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4310,7 +4298,7 @@
                    'invalid'). In those cases an exception is set, so we must
                    handle it.
                 */
-            #line 4314 "Python/generated_cases.c.h"
+            #line 4302 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4324,7 +4312,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3125 "Python/bytecodes.c"
+            #line 3113 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL | METH_KEYWORDS functions */
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4356,7 +4344,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4360 "Python/generated_cases.c.h"
+            #line 4348 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4370,7 +4358,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3160 "Python/bytecodes.c"
+            #line 3148 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* len(o) */
             int is_meth = method != NULL;
@@ -4395,7 +4383,7 @@
             Py_DECREF(callable);
             Py_DECREF(arg);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4399 "Python/generated_cases.c.h"
+            #line 4387 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4408,7 +4396,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3187 "Python/bytecodes.c"
+            #line 3175 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* isinstance(o, o2) */
             int is_meth = method != NULL;
@@ -4435,7 +4423,7 @@
             Py_DECREF(cls);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4439 "Python/generated_cases.c.h"
+            #line 4427 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4447,7 +4435,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *self = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 3217 "Python/bytecodes.c"
+            #line 3205 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             assert(method != NULL);
@@ -4465,14 +4453,14 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
             assert(next_instr[-1].op.code == POP_TOP);
             DISPATCH();
-            #line 4469 "Python/generated_cases.c.h"
+            #line 4457 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3237 "Python/bytecodes.c"
+            #line 3225 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4503,7 +4491,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4507 "Python/generated_cases.c.h"
+            #line 4495 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4516,7 +4504,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3271 "Python/bytecodes.c"
+            #line 3259 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4545,7 +4533,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4549 "Python/generated_cases.c.h"
+            #line 4537 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4558,7 +4546,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3303 "Python/bytecodes.c"
+            #line 3291 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 0 || oparg == 1);
             int is_meth = method != NULL;
@@ -4587,7 +4575,7 @@
             Py_DECREF(self);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4591 "Python/generated_cases.c.h"
+            #line 4579 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4600,7 +4588,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3335 "Python/bytecodes.c"
+            #line 3323 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4628,7 +4616,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4632 "Python/generated_cases.c.h"
+            #line 4620 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4638,9 +4626,9 @@
         }
 
         TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
-            #line 3366 "Python/bytecodes.c"
+            #line 3354 "Python/bytecodes.c"
             GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
-            #line 4644 "Python/generated_cases.c.h"
+            #line 4632 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_FUNCTION_EX) {
@@ -4649,7 +4637,7 @@
             PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
             PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
             PyObject *result;
-            #line 3370 "Python/bytecodes.c"
+            #line 3358 "Python/bytecodes.c"
             // DICT_MERGE is called before this opcode if there are kwargs.
             // It converts all dict subtypes in kwargs into regular dicts.
             assert(kwargs == NULL || PyDict_CheckExact(kwargs));
@@ -4711,14 +4699,14 @@
                 }
                 result = PyObject_Call(func, callargs, kwargs);
             }
-            #line 4715 "Python/generated_cases.c.h"
+            #line 4703 "Python/generated_cases.c.h"
             Py_DECREF(func);
             Py_DECREF(callargs);
             Py_XDECREF(kwargs);
-            #line 3432 "Python/bytecodes.c"
+            #line 3420 "Python/bytecodes.c"
             assert(PEEK(3 + (oparg & 1)) == NULL);
             if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
-            #line 4722 "Python/generated_cases.c.h"
+            #line 4710 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg & 1) ? 1 : 0));
             STACK_SHRINK(2);
             stack_pointer[-1] = result;
@@ -4729,7 +4717,7 @@
         TARGET(MAKE_FUNCTION) {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3438 "Python/bytecodes.c"
+            #line 3426 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -4741,7 +4729,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 4745 "Python/generated_cases.c.h"
+            #line 4733 "Python/generated_cases.c.h"
             stack_pointer[-1] = func;
             DISPATCH();
         }
@@ -4749,7 +4737,7 @@
         TARGET(SET_FUNCTION_ATTRIBUTE) {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3452 "Python/bytecodes.c"
+            #line 3440 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -4774,14 +4762,14 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 4778 "Python/generated_cases.c.h"
+            #line 4766 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             DISPATCH();
         }
 
         TARGET(RETURN_GENERATOR) {
-            #line 3479 "Python/bytecodes.c"
+            #line 3467 "Python/bytecodes.c"
             assert(PyFunction_Check(frame->f_funcobj));
             PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
             PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4802,7 +4790,7 @@
             frame = cframe.current_frame = prev;
             _PyFrame_StackPush(frame, (PyObject *)gen);
             goto resume_frame;
-            #line 4806 "Python/generated_cases.c.h"
+            #line 4794 "Python/generated_cases.c.h"
         }
 
         TARGET(BUILD_SLICE) {
@@ -4810,15 +4798,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3502 "Python/bytecodes.c"
+            #line 3490 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 4816 "Python/generated_cases.c.h"
+            #line 4804 "Python/generated_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3504 "Python/bytecodes.c"
+            #line 3492 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 4822 "Python/generated_cases.c.h"
+            #line 4810 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -4828,14 +4816,14 @@
         TARGET(CONVERT_VALUE) {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3508 "Python/bytecodes.c"
+            #line 3496 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 4839 "Python/generated_cases.c.h"
+            #line 4827 "Python/generated_cases.c.h"
             stack_pointer[-1] = result;
             DISPATCH();
         }
@@ -4843,7 +4831,7 @@
         TARGET(FORMAT_SIMPLE) {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3517 "Python/bytecodes.c"
+            #line 3505 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -4854,7 +4842,7 @@
             else {
                 res = value;
             }
-            #line 4858 "Python/generated_cases.c.h"
+            #line 4846 "Python/generated_cases.c.h"
             stack_pointer[-1] = res;
             DISPATCH();
         }
@@ -4863,12 +4851,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3530 "Python/bytecodes.c"
+            #line 3518 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 4872 "Python/generated_cases.c.h"
+            #line 4860 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -4877,10 +4865,10 @@
         TARGET(COPY) {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3537 "Python/bytecodes.c"
+            #line 3525 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 4884 "Python/generated_cases.c.h"
+            #line 4872 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             DISPATCH();
@@ -4892,7 +4880,7 @@
             PyObject *rhs = stack_pointer[-1];
             PyObject *lhs = stack_pointer[-2];
             PyObject *res;
-            #line 3542 "Python/bytecodes.c"
+            #line 3530 "Python/bytecodes.c"
             #if ENABLE_SPECIALIZATION
             _PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
             if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4907,12 +4895,12 @@
             assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
             assert(binary_ops[oparg]);
             res = binary_ops[oparg](lhs, rhs);
-            #line 4911 "Python/generated_cases.c.h"
+            #line 4899 "Python/generated_cases.c.h"
             Py_DECREF(lhs);
             Py_DECREF(rhs);
-            #line 3557 "Python/bytecodes.c"
+            #line 3545 "Python/bytecodes.c"
             if (res == NULL) goto pop_2_error;
-            #line 4916 "Python/generated_cases.c.h"
+            #line 4904 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             next_instr += 1;
@@ -4922,16 +4910,16 @@
         TARGET(SWAP) {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3562 "Python/bytecodes.c"
+            #line 3550 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 4928 "Python/generated_cases.c.h"
+            #line 4916 "Python/generated_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_INSTRUCTION) {
-            #line 3566 "Python/bytecodes.c"
+            #line 3554 "Python/bytecodes.c"
             int next_opcode = _Py_call_instrumentation_instruction(
                 tstate, frame, next_instr-1);
             if (next_opcode < 0) goto error;
@@ -4943,48 +4931,48 @@
             assert(next_opcode > 0 && next_opcode < 256);
             opcode = next_opcode;
             DISPATCH_GOTO();
-            #line 4947 "Python/generated_cases.c.h"
+            #line 4935 "Python/generated_cases.c.h"
         }
 
         TARGET(INSTRUMENTED_JUMP_FORWARD) {
-            #line 3580 "Python/bytecodes.c"
+            #line 3568 "Python/bytecodes.c"
             INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4953 "Python/generated_cases.c.h"
+            #line 4941 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_JUMP_BACKWARD) {
-            #line 3584 "Python/bytecodes.c"
+            #line 3572 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
             INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4961 "Python/generated_cases.c.h"
+            #line 4949 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
-            #line 3589 "Python/bytecodes.c"
+            #line 3577 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsTrue(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4972 "Python/generated_cases.c.h"
+            #line 4960 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
-            #line 3597 "Python/bytecodes.c"
+            #line 3585 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsFalse(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4983 "Python/generated_cases.c.h"
+            #line 4971 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
-            #line 3605 "Python/bytecodes.c"
+            #line 3593 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -4996,12 +4984,12 @@
                 offset = 0;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 5000 "Python/generated_cases.c.h"
+            #line 4988 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
-            #line 3619 "Python/bytecodes.c"
+            #line 3607 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -5013,30 +5001,30 @@
                 offset = oparg;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 5017 "Python/generated_cases.c.h"
+            #line 5005 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(EXTENDED_ARG) {
-            #line 3633 "Python/bytecodes.c"
+            #line 3621 "Python/bytecodes.c"
             assert(oparg);
             opcode = next_instr->op.code;
             oparg = oparg << 8 | next_instr->op.arg;
             PRE_DISPATCH_GOTO();
             DISPATCH_GOTO();
-            #line 5028 "Python/generated_cases.c.h"
+            #line 5016 "Python/generated_cases.c.h"
         }
 
         TARGET(CACHE) {
-            #line 3641 "Python/bytecodes.c"
+            #line 3629 "Python/bytecodes.c"
             assert(0 && "Executing a cache.");
             Py_UNREACHABLE();
-            #line 5035 "Python/generated_cases.c.h"
+            #line 5023 "Python/generated_cases.c.h"
         }
 
         TARGET(RESERVED) {
-            #line 3646 "Python/bytecodes.c"
+            #line 3634 "Python/bytecodes.c"
             assert(0 && "Executing RESERVED instruction.");
             Py_UNREACHABLE();
-            #line 5042 "Python/generated_cases.c.h"
+            #line 5030 "Python/generated_cases.c.h"
         }

From 6cd57194807b02789e4765e5b7ece8f73eca74fd Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 17:47:42 -0700
Subject: [PATCH 7/9] Tweak FOR_ITER so it's viable

---
 Python/bytecodes.c         |   4 +-
 Python/executor_cases.c.h  |  30 ++---
 Python/generated_cases.c.h | 250 +++++++++++++++++++------------------
 3 files changed, 144 insertions(+), 140 deletions(-)

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 905ca36c6165ac..77c55cda474a97 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2415,12 +2415,14 @@ dummy_func(
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         goto error;
                     }
-                    monitor_raise(tstate, frame, next_instr-1);
+                    monitor_raise(tstate, frame, frame->prev_instr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
+                #if ENABLE_SPECIALIZATION
                 assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
                        next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
+                #endif
                 Py_DECREF(iter);
                 /* Jump forward oparg, then skip following END_FOR instruction */
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 9d283dd6fefd39..55ad235d25b71e 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1833,7 +1833,7 @@
         case FOR_ITER_LIST: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2460 "Python/bytecodes.c"
+            #line 2462 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -1860,7 +1860,7 @@
         case FOR_ITER_TUPLE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2480 "Python/bytecodes.c"
+            #line 2482 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1887,7 +1887,7 @@
         case FOR_ITER_RANGE: {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2500 "Python/bytecodes.c"
+            #line 2502 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -1914,7 +1914,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2603 "Python/bytecodes.c"
+            #line 2605 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -1944,7 +1944,7 @@
         case PUSH_EXC_INFO: {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2642 "Python/bytecodes.c"
+            #line 2644 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -1963,7 +1963,7 @@
 
         case EXIT_INIT_CHECK: {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3012 "Python/bytecodes.c"
+            #line 3014 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -1979,7 +1979,7 @@
         case MAKE_FUNCTION: {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3426 "Python/bytecodes.c"
+            #line 3428 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -1999,7 +1999,7 @@
         case SET_FUNCTION_ATTRIBUTE: {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3440 "Python/bytecodes.c"
+            #line 3442 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -2035,13 +2035,13 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3490 "Python/bytecodes.c"
+            #line 3492 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
             #line 2041 "Python/executor_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3492 "Python/bytecodes.c"
+            #line 3494 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
             #line 2047 "Python/executor_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
@@ -2053,7 +2053,7 @@
         case CONVERT_VALUE: {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3496 "Python/bytecodes.c"
+            #line 3498 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
@@ -2068,7 +2068,7 @@
         case FORMAT_SIMPLE: {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3505 "Python/bytecodes.c"
+            #line 3507 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -2088,7 +2088,7 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3518 "Python/bytecodes.c"
+            #line 3520 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
@@ -2102,7 +2102,7 @@
         case COPY: {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3525 "Python/bytecodes.c"
+            #line 3527 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
             #line 2109 "Python/executor_cases.c.h"
@@ -2114,7 +2114,7 @@
         case SWAP: {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3550 "Python/bytecodes.c"
+            #line 3552 "Python/bytecodes.c"
             assert(oparg >= 2);
             #line 2120 "Python/executor_cases.c.h"
             stack_pointer[-1] = bottom;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 70754de76ff1b3..8dae355d77f38c 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -3441,18 +3441,20 @@
                     if (!_PyErr_ExceptionMatches(tstate, PyExc_StopIteration)) {
                         goto error;
                     }
-                    monitor_raise(tstate, frame, next_instr-1);
+                    monitor_raise(tstate, frame, frame->prev_instr);
                     _PyErr_Clear(tstate);
                 }
                 /* iterator ended normally */
+                #if ENABLE_SPECIALIZATION
                 assert(next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == END_FOR ||
                        next_instr[INLINE_CACHE_ENTRIES_FOR_ITER + oparg].op.code == INSTRUMENTED_END_FOR);
+                #endif
                 Py_DECREF(iter);
                 /* Jump forward oparg, then skip following END_FOR instruction */
                 JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
             }
             // Common case: no jump, leave it to the code generator
-            #line 3456 "Python/generated_cases.c.h"
+            #line 3458 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3460,7 +3462,7 @@
         }
 
         TARGET(INSTRUMENTED_FOR_ITER) {
-            #line 2432 "Python/bytecodes.c"
+            #line 2434 "Python/bytecodes.c"
             _Py_CODEUNIT *here = next_instr-1;
             _Py_CODEUNIT *target;
             PyObject *iter = TOP();
@@ -3486,14 +3488,14 @@
                 target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
             }
             INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
-            #line 3490 "Python/generated_cases.c.h"
+            #line 3492 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(FOR_ITER_LIST) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2460 "Python/bytecodes.c"
+            #line 2462 "Python/bytecodes.c"
             DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
             _PyListIterObject *it = (_PyListIterObject *)iter;
             STAT_INC(FOR_ITER, hit);
@@ -3511,7 +3513,7 @@
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
         end_for_iter_list:
             // Common case: no jump, leave it to the code generator
-            #line 3515 "Python/generated_cases.c.h"
+            #line 3517 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3521,7 +3523,7 @@
         TARGET(FOR_ITER_TUPLE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2480 "Python/bytecodes.c"
+            #line 2482 "Python/bytecodes.c"
             _PyTupleIterObject *it = (_PyTupleIterObject *)iter;
             DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3539,7 +3541,7 @@
             JUMP_POP_DISPATCH(INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1, 1);
         end_for_iter_tuple:
             // Common case: no jump, leave it to the code generator
-            #line 3543 "Python/generated_cases.c.h"
+            #line 3545 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3549,7 +3551,7 @@
         TARGET(FOR_ITER_RANGE) {
             PyObject *iter = stack_pointer[-1];
             PyObject *next;
-            #line 2500 "Python/bytecodes.c"
+            #line 2502 "Python/bytecodes.c"
             _PyRangeIterObject *r = (_PyRangeIterObject *)iter;
             DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
             STAT_INC(FOR_ITER, hit);
@@ -3565,7 +3567,7 @@
             if (next == NULL) {
                 goto error;
             }
-            #line 3569 "Python/generated_cases.c.h"
+            #line 3571 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = next;
             next_instr += 1;
@@ -3574,7 +3576,7 @@
 
         TARGET(FOR_ITER_GEN) {
             PyObject *iter = stack_pointer[-1];
-            #line 2518 "Python/bytecodes.c"
+            #line 2520 "Python/bytecodes.c"
             DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
             PyGenObject *gen = (PyGenObject *)iter;
             DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3590,14 +3592,14 @@
             assert(next_instr[oparg].op.code == END_FOR ||
                    next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
             DISPATCH_INLINED(gen_frame);
-            #line 3594 "Python/generated_cases.c.h"
+            #line 3596 "Python/generated_cases.c.h"
         }
 
         TARGET(BEFORE_ASYNC_WITH) {
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2536 "Python/bytecodes.c"
+            #line 2538 "Python/bytecodes.c"
             PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
             if (enter == NULL) {
                 if (!_PyErr_Occurred(tstate)) {
@@ -3620,16 +3622,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3624 "Python/generated_cases.c.h"
+            #line 3626 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2559 "Python/bytecodes.c"
+            #line 2561 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3633 "Python/generated_cases.c.h"
+            #line 3635 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3640,7 +3642,7 @@
             PyObject *mgr = stack_pointer[-1];
             PyObject *exit;
             PyObject *res;
-            #line 2568 "Python/bytecodes.c"
+            #line 2570 "Python/bytecodes.c"
             /* pop the context manager, push its __exit__ and the
              * value returned from calling its __enter__
              */
@@ -3666,16 +3668,16 @@
                 Py_DECREF(enter);
                 goto error;
             }
-            #line 3670 "Python/generated_cases.c.h"
+            #line 3672 "Python/generated_cases.c.h"
             Py_DECREF(mgr);
-            #line 2594 "Python/bytecodes.c"
+            #line 2596 "Python/bytecodes.c"
             res = _PyObject_CallNoArgs(enter);
             Py_DECREF(enter);
             if (res == NULL) {
                 Py_DECREF(exit);
                 if (true) goto pop_1_error;
             }
-            #line 3679 "Python/generated_cases.c.h"
+            #line 3681 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             stack_pointer[-2] = exit;
@@ -3687,7 +3689,7 @@
             PyObject *lasti = stack_pointer[-3];
             PyObject *exit_func = stack_pointer[-4];
             PyObject *res;
-            #line 2603 "Python/bytecodes.c"
+            #line 2605 "Python/bytecodes.c"
             /* At the top of the stack are 4 values:
                - val: TOP = exc_info()
                - unused: SECOND = previous exception
@@ -3708,7 +3710,7 @@
             res = PyObject_Vectorcall(exit_func, stack + 1,
                     3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
             if (res == NULL) goto error;
-            #line 3712 "Python/generated_cases.c.h"
+            #line 3714 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -3717,7 +3719,7 @@
         TARGET(PUSH_EXC_INFO) {
             PyObject *new_exc = stack_pointer[-1];
             PyObject *prev_exc;
-            #line 2642 "Python/bytecodes.c"
+            #line 2644 "Python/bytecodes.c"
             _PyErr_StackItem *exc_info = tstate->exc_info;
             if (exc_info->exc_value != NULL) {
                 prev_exc = exc_info->exc_value;
@@ -3727,7 +3729,7 @@
             }
             assert(PyExceptionInstance_Check(new_exc));
             exc_info->exc_value = Py_NewRef(new_exc);
-            #line 3731 "Python/generated_cases.c.h"
+            #line 3733 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = new_exc;
             stack_pointer[-2] = prev_exc;
@@ -3741,7 +3743,7 @@
             uint32_t type_version = read_u32(&next_instr[1].cache);
             uint32_t keys_version = read_u32(&next_instr[3].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2654 "Python/bytecodes.c"
+            #line 2656 "Python/bytecodes.c"
             /* Cached method object */
             PyTypeObject *self_cls = Py_TYPE(self);
             assert(type_version != 0);
@@ -3758,7 +3760,7 @@
             assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
             res = self;
             assert(oparg & 1);
-            #line 3762 "Python/generated_cases.c.h"
+            #line 3764 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3772,7 +3774,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2673 "Python/bytecodes.c"
+            #line 2675 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             assert(self_cls->tp_dictoffset == 0);
@@ -3782,7 +3784,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3786 "Python/generated_cases.c.h"
+            #line 3788 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3796,7 +3798,7 @@
             PyObject *res;
             uint32_t type_version = read_u32(&next_instr[1].cache);
             PyObject *descr = read_obj(&next_instr[5].cache);
-            #line 2685 "Python/bytecodes.c"
+            #line 2687 "Python/bytecodes.c"
             PyTypeObject *self_cls = Py_TYPE(self);
             DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
             Py_ssize_t dictoffset = self_cls->tp_dictoffset;
@@ -3810,7 +3812,7 @@
             res2 = Py_NewRef(descr);
             res = self;
             assert(oparg & 1);
-            #line 3814 "Python/generated_cases.c.h"
+            #line 3816 "Python/generated_cases.c.h"
             STACK_GROW(((oparg & 1) ? 1 : 0));
             stack_pointer[-1] = res;
             if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3819,16 +3821,16 @@
         }
 
         TARGET(KW_NAMES) {
-            #line 2701 "Python/bytecodes.c"
+            #line 2703 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
             kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
-            #line 3827 "Python/generated_cases.c.h"
+            #line 3829 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_CALL) {
-            #line 2707 "Python/bytecodes.c"
+            #line 2709 "Python/bytecodes.c"
             int is_meth = PEEK(oparg+2) != NULL;
             int total_args = oparg + is_meth;
             PyObject *function = PEEK(total_args + 1);
@@ -3841,7 +3843,7 @@
             _PyCallCache *cache = (_PyCallCache *)next_instr;
             INCREMENT_ADAPTIVE_COUNTER(cache->counter);
             GO_TO_INSTRUCTION(CALL);
-            #line 3845 "Python/generated_cases.c.h"
+            #line 3847 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL) {
@@ -3851,7 +3853,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2753 "Python/bytecodes.c"
+            #line 2755 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -3933,7 +3935,7 @@
                 Py_DECREF(args[i]);
             }
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 3937 "Python/generated_cases.c.h"
+            #line 3939 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -3945,7 +3947,7 @@
         TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 2841 "Python/bytecodes.c"
+            #line 2843 "Python/bytecodes.c"
             DEOPT_IF(method != NULL, CALL);
             DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
             STAT_INC(CALL, hit);
@@ -3955,7 +3957,7 @@
             PEEK(oparg + 2) = Py_NewRef(meth);  // method
             Py_DECREF(callable);
             GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
-            #line 3959 "Python/generated_cases.c.h"
+            #line 3961 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_EXACT_ARGS) {
@@ -3964,7 +3966,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2853 "Python/bytecodes.c"
+            #line 2855 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -3990,7 +3992,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 3994 "Python/generated_cases.c.h"
+            #line 3996 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3998,7 +4000,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             uint32_t func_version = read_u32(&next_instr[1].cache);
-            #line 2881 "Python/bytecodes.c"
+            #line 2883 "Python/bytecodes.c"
             assert(kwnames == NULL);
             DEOPT_IF(tstate->interp->eval_frame, CALL);
             int is_meth = method != NULL;
@@ -4034,7 +4036,7 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
             frame->return_offset = 0;
             DISPATCH_INLINED(new_frame);
-            #line 4038 "Python/generated_cases.c.h"
+            #line 4040 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_TYPE_1) {
@@ -4042,7 +4044,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2919 "Python/bytecodes.c"
+            #line 2921 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4052,7 +4054,7 @@
             res = Py_NewRef(Py_TYPE(obj));
             Py_DECREF(obj);
             Py_DECREF(&PyType_Type);  // I.e., callable
-            #line 4056 "Python/generated_cases.c.h"
+            #line 4058 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4065,7 +4067,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2931 "Python/bytecodes.c"
+            #line 2933 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4076,7 +4078,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyUnicode_Type);  // I.e., callable
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4080 "Python/generated_cases.c.h"
+            #line 4082 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4090,7 +4092,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 2945 "Python/bytecodes.c"
+            #line 2947 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             DEOPT_IF(null != NULL, CALL);
@@ -4101,7 +4103,7 @@
             Py_DECREF(arg);
             Py_DECREF(&PyTuple_Type);  // I.e., tuple
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4105 "Python/generated_cases.c.h"
+            #line 4107 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4114,7 +4116,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *null = stack_pointer[-(2 + oparg)];
-            #line 2959 "Python/bytecodes.c"
+            #line 2961 "Python/bytecodes.c"
             /* This instruction does the following:
              * 1. Creates the object (by calling ``object.__new__``)
              * 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
@@ -4165,12 +4167,12 @@
              * as it will be checked after start_frame */
             tstate->py_recursion_remaining--;
             goto start_frame;
-            #line 4169 "Python/generated_cases.c.h"
+            #line 4171 "Python/generated_cases.c.h"
         }
 
         TARGET(EXIT_INIT_CHECK) {
             PyObject *should_be_none = stack_pointer[-1];
-            #line 3012 "Python/bytecodes.c"
+            #line 3014 "Python/bytecodes.c"
             assert(STACK_LEVEL() == 2);
             if (should_be_none != Py_None) {
                 PyErr_Format(PyExc_TypeError,
@@ -4178,7 +4180,7 @@
                     Py_TYPE(should_be_none)->tp_name);
                 goto error;
             }
-            #line 4182 "Python/generated_cases.c.h"
+            #line 4184 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             DISPATCH();
         }
@@ -4188,7 +4190,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3022 "Python/bytecodes.c"
+            #line 3024 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4210,7 +4212,7 @@
             }
             Py_DECREF(tp);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4214 "Python/generated_cases.c.h"
+            #line 4216 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4224,7 +4226,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3047 "Python/bytecodes.c"
+            #line 3049 "Python/bytecodes.c"
             /* Builtin METH_O functions */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4252,7 +4254,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4256 "Python/generated_cases.c.h"
+            #line 4258 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4266,7 +4268,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3078 "Python/bytecodes.c"
+            #line 3080 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL functions, without keywords */
             assert(kwnames == NULL);
             int is_meth = method != NULL;
@@ -4298,7 +4300,7 @@
                    'invalid'). In those cases an exception is set, so we must
                    handle it.
                 */
-            #line 4302 "Python/generated_cases.c.h"
+            #line 4304 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4312,7 +4314,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3113 "Python/bytecodes.c"
+            #line 3115 "Python/bytecodes.c"
             /* Builtin METH_FASTCALL | METH_KEYWORDS functions */
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4344,7 +4346,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4348 "Python/generated_cases.c.h"
+            #line 4350 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4358,7 +4360,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3148 "Python/bytecodes.c"
+            #line 3150 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* len(o) */
             int is_meth = method != NULL;
@@ -4383,7 +4385,7 @@
             Py_DECREF(callable);
             Py_DECREF(arg);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4387 "Python/generated_cases.c.h"
+            #line 4389 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4396,7 +4398,7 @@
             PyObject *callable = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3175 "Python/bytecodes.c"
+            #line 3177 "Python/bytecodes.c"
             assert(kwnames == NULL);
             /* isinstance(o, o2) */
             int is_meth = method != NULL;
@@ -4423,7 +4425,7 @@
             Py_DECREF(cls);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4427 "Python/generated_cases.c.h"
+            #line 4429 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4435,7 +4437,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *self = stack_pointer[-(1 + oparg)];
             PyObject *method = stack_pointer[-(2 + oparg)];
-            #line 3205 "Python/bytecodes.c"
+            #line 3207 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 1);
             assert(method != NULL);
@@ -4453,14 +4455,14 @@
             SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
             assert(next_instr[-1].op.code == POP_TOP);
             DISPATCH();
-            #line 4457 "Python/generated_cases.c.h"
+            #line 4459 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3225 "Python/bytecodes.c"
+            #line 3227 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4491,7 +4493,7 @@
             Py_DECREF(arg);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4495 "Python/generated_cases.c.h"
+            #line 4497 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4504,7 +4506,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3259 "Python/bytecodes.c"
+            #line 3261 "Python/bytecodes.c"
             int is_meth = method != NULL;
             int total_args = oparg;
             if (is_meth) {
@@ -4533,7 +4535,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4537 "Python/generated_cases.c.h"
+            #line 4539 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4546,7 +4548,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3291 "Python/bytecodes.c"
+            #line 3293 "Python/bytecodes.c"
             assert(kwnames == NULL);
             assert(oparg == 0 || oparg == 1);
             int is_meth = method != NULL;
@@ -4575,7 +4577,7 @@
             Py_DECREF(self);
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4579 "Python/generated_cases.c.h"
+            #line 4581 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4588,7 +4590,7 @@
             PyObject **args = (stack_pointer - oparg);
             PyObject *method = stack_pointer[-(2 + oparg)];
             PyObject *res;
-            #line 3323 "Python/bytecodes.c"
+            #line 3325 "Python/bytecodes.c"
             assert(kwnames == NULL);
             int is_meth = method != NULL;
             int total_args = oparg;
@@ -4616,7 +4618,7 @@
             }
             Py_DECREF(callable);
             if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
-            #line 4620 "Python/generated_cases.c.h"
+            #line 4622 "Python/generated_cases.c.h"
             STACK_SHRINK(oparg);
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
@@ -4626,9 +4628,9 @@
         }
 
         TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
-            #line 3354 "Python/bytecodes.c"
+            #line 3356 "Python/bytecodes.c"
             GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
-            #line 4632 "Python/generated_cases.c.h"
+            #line 4634 "Python/generated_cases.c.h"
         }
 
         TARGET(CALL_FUNCTION_EX) {
@@ -4637,7 +4639,7 @@
             PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
             PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
             PyObject *result;
-            #line 3358 "Python/bytecodes.c"
+            #line 3360 "Python/bytecodes.c"
             // DICT_MERGE is called before this opcode if there are kwargs.
             // It converts all dict subtypes in kwargs into regular dicts.
             assert(kwargs == NULL || PyDict_CheckExact(kwargs));
@@ -4699,14 +4701,14 @@
                 }
                 result = PyObject_Call(func, callargs, kwargs);
             }
-            #line 4703 "Python/generated_cases.c.h"
+            #line 4705 "Python/generated_cases.c.h"
             Py_DECREF(func);
             Py_DECREF(callargs);
             Py_XDECREF(kwargs);
-            #line 3420 "Python/bytecodes.c"
+            #line 3422 "Python/bytecodes.c"
             assert(PEEK(3 + (oparg & 1)) == NULL);
             if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
-            #line 4710 "Python/generated_cases.c.h"
+            #line 4712 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg & 1) ? 1 : 0));
             STACK_SHRINK(2);
             stack_pointer[-1] = result;
@@ -4717,7 +4719,7 @@
         TARGET(MAKE_FUNCTION) {
             PyObject *codeobj = stack_pointer[-1];
             PyObject *func;
-            #line 3426 "Python/bytecodes.c"
+            #line 3428 "Python/bytecodes.c"
 
             PyFunctionObject *func_obj = (PyFunctionObject *)
                 PyFunction_New(codeobj, GLOBALS());
@@ -4729,7 +4731,7 @@
 
             func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
             func = (PyObject *)func_obj;
-            #line 4733 "Python/generated_cases.c.h"
+            #line 4735 "Python/generated_cases.c.h"
             stack_pointer[-1] = func;
             DISPATCH();
         }
@@ -4737,7 +4739,7 @@
         TARGET(SET_FUNCTION_ATTRIBUTE) {
             PyObject *func = stack_pointer[-1];
             PyObject *attr = stack_pointer[-2];
-            #line 3440 "Python/bytecodes.c"
+            #line 3442 "Python/bytecodes.c"
             assert(PyFunction_Check(func));
             PyFunctionObject *func_obj = (PyFunctionObject *)func;
             switch(oparg) {
@@ -4762,14 +4764,14 @@
                 default:
                     Py_UNREACHABLE();
             }
-            #line 4766 "Python/generated_cases.c.h"
+            #line 4768 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = func;
             DISPATCH();
         }
 
         TARGET(RETURN_GENERATOR) {
-            #line 3467 "Python/bytecodes.c"
+            #line 3469 "Python/bytecodes.c"
             assert(PyFunction_Check(frame->f_funcobj));
             PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
             PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4790,7 +4792,7 @@
             frame = cframe.current_frame = prev;
             _PyFrame_StackPush(frame, (PyObject *)gen);
             goto resume_frame;
-            #line 4794 "Python/generated_cases.c.h"
+            #line 4796 "Python/generated_cases.c.h"
         }
 
         TARGET(BUILD_SLICE) {
@@ -4798,15 +4800,15 @@
             PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
             PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
             PyObject *slice;
-            #line 3490 "Python/bytecodes.c"
+            #line 3492 "Python/bytecodes.c"
             slice = PySlice_New(start, stop, step);
-            #line 4804 "Python/generated_cases.c.h"
+            #line 4806 "Python/generated_cases.c.h"
             Py_DECREF(start);
             Py_DECREF(stop);
             Py_XDECREF(step);
-            #line 3492 "Python/bytecodes.c"
+            #line 3494 "Python/bytecodes.c"
             if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
-            #line 4810 "Python/generated_cases.c.h"
+            #line 4812 "Python/generated_cases.c.h"
             STACK_SHRINK(((oparg == 3) ? 1 : 0));
             STACK_SHRINK(1);
             stack_pointer[-1] = slice;
@@ -4816,14 +4818,14 @@
         TARGET(CONVERT_VALUE) {
             PyObject *value = stack_pointer[-1];
             PyObject *result;
-            #line 3496 "Python/bytecodes.c"
+            #line 3498 "Python/bytecodes.c"
             convertion_func_ptr  conv_fn;
             assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
             conv_fn = CONVERSION_FUNCTIONS[oparg];
             result = conv_fn(value);
             Py_DECREF(value);
             if (result == NULL) goto pop_1_error;
-            #line 4827 "Python/generated_cases.c.h"
+            #line 4829 "Python/generated_cases.c.h"
             stack_pointer[-1] = result;
             DISPATCH();
         }
@@ -4831,7 +4833,7 @@
         TARGET(FORMAT_SIMPLE) {
             PyObject *value = stack_pointer[-1];
             PyObject *res;
-            #line 3505 "Python/bytecodes.c"
+            #line 3507 "Python/bytecodes.c"
             /* If value is a unicode object, then we know the result
              * of format(value) is value itself. */
             if (!PyUnicode_CheckExact(value)) {
@@ -4842,7 +4844,7 @@
             else {
                 res = value;
             }
-            #line 4846 "Python/generated_cases.c.h"
+            #line 4848 "Python/generated_cases.c.h"
             stack_pointer[-1] = res;
             DISPATCH();
         }
@@ -4851,12 +4853,12 @@
             PyObject *fmt_spec = stack_pointer[-1];
             PyObject *value = stack_pointer[-2];
             PyObject *res;
-            #line 3518 "Python/bytecodes.c"
+            #line 3520 "Python/bytecodes.c"
             res = PyObject_Format(value, fmt_spec);
             Py_DECREF(value);
             Py_DECREF(fmt_spec);
             if (res == NULL) goto pop_2_error;
-            #line 4860 "Python/generated_cases.c.h"
+            #line 4862 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             DISPATCH();
@@ -4865,10 +4867,10 @@
         TARGET(COPY) {
             PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
             PyObject *top;
-            #line 3525 "Python/bytecodes.c"
+            #line 3527 "Python/bytecodes.c"
             assert(oparg > 0);
             top = Py_NewRef(bottom);
-            #line 4872 "Python/generated_cases.c.h"
+            #line 4874 "Python/generated_cases.c.h"
             STACK_GROW(1);
             stack_pointer[-1] = top;
             DISPATCH();
@@ -4880,7 +4882,7 @@
             PyObject *rhs = stack_pointer[-1];
             PyObject *lhs = stack_pointer[-2];
             PyObject *res;
-            #line 3530 "Python/bytecodes.c"
+            #line 3532 "Python/bytecodes.c"
             #if ENABLE_SPECIALIZATION
             _PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
             if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4895,12 +4897,12 @@
             assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
             assert(binary_ops[oparg]);
             res = binary_ops[oparg](lhs, rhs);
-            #line 4899 "Python/generated_cases.c.h"
+            #line 4901 "Python/generated_cases.c.h"
             Py_DECREF(lhs);
             Py_DECREF(rhs);
-            #line 3545 "Python/bytecodes.c"
+            #line 3547 "Python/bytecodes.c"
             if (res == NULL) goto pop_2_error;
-            #line 4904 "Python/generated_cases.c.h"
+            #line 4906 "Python/generated_cases.c.h"
             STACK_SHRINK(1);
             stack_pointer[-1] = res;
             next_instr += 1;
@@ -4910,16 +4912,16 @@
         TARGET(SWAP) {
             PyObject *top = stack_pointer[-1];
             PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
-            #line 3550 "Python/bytecodes.c"
+            #line 3552 "Python/bytecodes.c"
             assert(oparg >= 2);
-            #line 4916 "Python/generated_cases.c.h"
+            #line 4918 "Python/generated_cases.c.h"
             stack_pointer[-1] = bottom;
             stack_pointer[-(2 + (oparg-2))] = top;
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_INSTRUCTION) {
-            #line 3554 "Python/bytecodes.c"
+            #line 3556 "Python/bytecodes.c"
             int next_opcode = _Py_call_instrumentation_instruction(
                 tstate, frame, next_instr-1);
             if (next_opcode < 0) goto error;
@@ -4931,48 +4933,48 @@
             assert(next_opcode > 0 && next_opcode < 256);
             opcode = next_opcode;
             DISPATCH_GOTO();
-            #line 4935 "Python/generated_cases.c.h"
+            #line 4937 "Python/generated_cases.c.h"
         }
 
         TARGET(INSTRUMENTED_JUMP_FORWARD) {
-            #line 3568 "Python/bytecodes.c"
+            #line 3570 "Python/bytecodes.c"
             INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4941 "Python/generated_cases.c.h"
+            #line 4943 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_JUMP_BACKWARD) {
-            #line 3572 "Python/bytecodes.c"
+            #line 3574 "Python/bytecodes.c"
             CHECK_EVAL_BREAKER();
             INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
-            #line 4949 "Python/generated_cases.c.h"
+            #line 4951 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
-            #line 3577 "Python/bytecodes.c"
+            #line 3579 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsTrue(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4960 "Python/generated_cases.c.h"
+            #line 4962 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
-            #line 3585 "Python/bytecodes.c"
+            #line 3587 "Python/bytecodes.c"
             PyObject *cond = POP();
             assert(PyBool_Check(cond));
             _Py_CODEUNIT *here = next_instr - 1;
             int offset = Py_IsFalse(cond) * oparg;
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4971 "Python/generated_cases.c.h"
+            #line 4973 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
-            #line 3593 "Python/bytecodes.c"
+            #line 3595 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -4984,12 +4986,12 @@
                 offset = 0;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 4988 "Python/generated_cases.c.h"
+            #line 4990 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
-            #line 3607 "Python/bytecodes.c"
+            #line 3609 "Python/bytecodes.c"
             PyObject *value = POP();
             _Py_CODEUNIT *here = next_instr-1;
             int offset;
@@ -5001,30 +5003,30 @@
                 offset = oparg;
             }
             INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
-            #line 5005 "Python/generated_cases.c.h"
+            #line 5007 "Python/generated_cases.c.h"
             DISPATCH();
         }
 
         TARGET(EXTENDED_ARG) {
-            #line 3621 "Python/bytecodes.c"
+            #line 3623 "Python/bytecodes.c"
             assert(oparg);
             opcode = next_instr->op.code;
             oparg = oparg << 8 | next_instr->op.arg;
             PRE_DISPATCH_GOTO();
             DISPATCH_GOTO();
-            #line 5016 "Python/generated_cases.c.h"
+            #line 5018 "Python/generated_cases.c.h"
         }
 
         TARGET(CACHE) {
-            #line 3629 "Python/bytecodes.c"
+            #line 3631 "Python/bytecodes.c"
             assert(0 && "Executing a cache.");
             Py_UNREACHABLE();
-            #line 5023 "Python/generated_cases.c.h"
+            #line 5025 "Python/generated_cases.c.h"
         }
 
         TARGET(RESERVED) {
-            #line 3634 "Python/bytecodes.c"
+            #line 3636 "Python/bytecodes.c"
             assert(0 && "Executing RESERVED instruction.");
             Py_UNREACHABLE();
-            #line 5030 "Python/generated_cases.c.h"
+            #line 5032 "Python/generated_cases.c.h"
         }

From b33a1a29e192bbcab6cf51756ab351e2185ece6c Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 18:12:18 -0700
Subject: [PATCH 8/9] Check room available for JUMP_TO_TOP

---
 Python/optimizer.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Python/optimizer.c b/Python/optimizer.c
index 822ada9fae6cd8..394e9be3a05ecb 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -455,9 +455,11 @@ translate_bytecode_to_trace(
             }
             case JUMP_BACKWARD:
             {
-                if (instr + 2 - operand == initial_instr) {
+                if (instr + 2 - operand == initial_instr
+                    && trace_length + 3 <= max_length)
+                {
                     ADD_TO_TRACE(JUMP_TO_TOP, 0);
-                    break;
+                    goto done;
                 }
                 // Else fall through!
             }

From f5e18d8f6d4e235984bf34295019683fcd07bee6 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 3 Jul 2023 18:28:09 -0700
Subject: [PATCH 9/9] A stray JUMP_BACKWARD also ends the trace

---
 Python/optimizer.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Python/optimizer.c b/Python/optimizer.c
index 394e9be3a05ecb..00524c8be0d81b 100644
--- a/Python/optimizer.c
+++ b/Python/optimizer.c
@@ -459,9 +459,11 @@ translate_bytecode_to_trace(
                     && trace_length + 3 <= max_length)
                 {
                     ADD_TO_TRACE(JUMP_TO_TOP, 0);
-                    goto done;
                 }
-                // Else fall through!
+                else {
+                    DPRINTF(2, "JUMP_BACKWARD not to top ends trace\n");
+                }
+                goto done;
             }
             default:
             {