Clean up the diff

markshannon · Mar 21, 2022 · Mar 10, 2022 · Mar 10, 2022 · Mar 10, 2022 · Mar 10, 2022
commit 7df49342d5ad5ce921c3f8d17f8f2330823b9cbf
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
@@ -38,7 +38,6 @@ struct PyCodeObject {
      * - co_stacksize
      * - co_flags
      * - co_firstlineno
-     * - co_code
      * - co_consts
      * - co_names
      * - co_localsplusnames
@@ -55,7 +54,7 @@ struct PyCodeObject {
     PyObject *co_names;         /* list of strings (names used) */
     PyObject *co_exceptiontable; /* Byte string encoding exception handling table */
     int co_flags;               /* CO_..., see below */
-    int co_warmup;              // XXX
+    int co_warmup;              /* Warmup counter for quickening */
 
     // The rest are not so impactful on performance.
     int co_argcount;            /* #arguments, except *args */

@@ -1325,7 +1325,8 @@ eval_frame_handle_pending(PyThreadState *tstate)
 #define SKIP_CALL() \
     JUMPBY(INLINE_CACHE_ENTRIES_PRECALL + 1 + INLINE_CACHE_ENTRIES_CALL)
 
-#define TRACING_NEXTOPARG()  do { \
+/* Get opcode and oparg from original instructions, not quickened form. */
+#define TRACING_NEXTOPARG() do { \
         _Py_CODEUNIT word = _Py_Unquickened(frame->f_code)[INSTR_OFFSET()]; \
         opcode = _Py_OPCODE(word); \
         oparg = _Py_OPARG(word); \

diff --git a/Python/makeopcodetargets.py b/Python/makeopcodetargets.py
@@ -3,7 +3,6 @@
 (for compilers supporting computed gotos or "labels-as-values", such as gcc).
 """
 
-from itertools import chain
 import os
 import sys