Merge remote-tracking branch 'upstream/main' into jump_no_interrupt

python · iritkatriel · Apr 5, 2022 · Mar 31, 2022 · Mar 31, 2022 · Mar 31, 2022
commit fb8232eb3253de8b5b2e918cc321ac60d94b4b41
@@ -397,7 +397,7 @@ def _write_atomic(path, data, mode=0o666):
 #     Python 3.11a6 3487 (Remove the adaptive "oparg counter" mechanism)
 #     Python 3.11a6 3488 (LOAD_GLOBAL can push additional NULL)
 #     Python 3.11a6 3489 (Add JUMP_BACKWARD, remove JUMP_ABSOLUTE)
-#     Python 3.11a6 3490 (Add JUMP_BACKWARD_NO_INTERRUPT, remove JUMP_NO_INTERRUPT)
+#     Python 3.11a6 3490 (remove JUMP_IF_NOT_EXC_MATCH, add CHECK_EXC_MATCH)

 #     Python 3.12 will start with magic number 3500

@@ -413,7 +413,6 @@ def _write_atomic(path, data, mode=0o666):
 # in PC/launcher.c must also be updated.

 MAGIC_NUMBER = (3490).to_bytes(2, 'little') + b'\r\n'
-
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little')  # For import.c

 _PYCACHE = '__pycache__'

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -684,9 +684,7 @@ def test_boundaries(self):
    def test_widths(self):
        for opcode, opname in enumerate(dis.opname):
            if opname in ('BUILD_MAP_UNPACK_WITH_CALL',
-                          'BUILD_TUPLE_UNPACK_WITH_CALL',
-                          'JUMP_IF_NOT_EXC_MATCH',
-                          'JUMP_BACKWARD_NO_INTERRUPT'):
+                          'BUILD_TUPLE_UNPACK_WITH_CALL'):
                continue
            with self.subTest(opname=opname):
                width = dis._OPNAME_WIDTH