Merge branch 'main' into compact-debug-info

python · markshannon · Apr 21, 2022 · Apr 8, 2022 · Apr 14, 2022 · Apr 14, 2022
commit 8ec48cf4458f7439d1c45a1ba16a7982d168e3d4
@@ -400,8 +400,9 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.11a6 3490 (remove JUMP_IF_NOT_EXC_MATCH, add CHECK_EXC_MATCH)
 #     Python 3.11a6 3491 (remove JUMP_IF_NOT_EG_MATCH, add CHECK_EG_MATCH,
 #                         add JUMP_BACKWARD_NO_INTERRUPT, make JUMP_NO_INTERRUPT virtual)
-#     Python 3.11a7 3494 (New location info table)
-
+#     Python 3.11a7 3492 (make POP_JUMP_IF_NONE/NOT_NONE/TRUE/FALSE relative)
+#     Python 3.11a7 3493 (Make JUMP_IF_TRUE_OR_POP/JUMP_IF_FALSE_OR_POP relative)
+#    Python 3.11a7 3494 (New location info table)
 #     Python 3.12 will start with magic number 3500



@@ -7053,22 +7053,17 @@ compiler_match(struct compiler *c, stmt_ty s)

 struct assembler {
    PyObject *a_bytecode;  /* bytes containing bytecode */
-    PyObject *a_lnotab;    /* bytes containing lnotab */
-    PyObject *a_enotab;    /* bytes containing enotab */
-    PyObject *a_cnotab;    /* bytes containing cnotab */
    PyObject *a_except_table;  /* bytes containing exception table */
    basicblock *a_entry;
    int a_offset;              /* offset into bytecode */
    int a_nblocks;             /* number of reachable blocks */
-    PyObject *a_except_table;  /* bytes containing exception table */
    int a_except_table_off;    /* offset into exception table */
    int a_prevlineno;     /* lineno of last emitted line in line table */
    int a_prev_end_lineno; /* end_lineno of last emitted line in line table */
    int a_lineno;          /* lineno of last emitted instruction */
    int a_end_lineno;      /* end_lineno of last emitted instruction */
    int a_lineno_start;    /* bytecode start offset of current lineno */
    int a_end_lineno_start; /* bytecode start offset of current end_lineno */
-    basicblock *a_entry;
    /* Location Info */
    PyObject* a_linetable; /* bytes containing location info */
    int a_location_off;    /* offset of last written location info frame */