Limited 3.14 support.

rocky · rocky · commit b6eaeb5d96c5 · 2025-09-26T09:08:03.000-04:00
Add 3.14 magic numbers.
diff --git a/pytest/test_cross_dis.py b/pytest/test_cross_dis.py
@@ -3,10 +3,14 @@
 import pytest
 from xdis.cross_dis import findlabels
 from xdis.op_imports import get_opcode_module
-from xdis.version_info import IS_GRAAL
+from xdis.version_info import IS_GRAAL, PYTHON_VERSION_TRIPLE
 
 
 @pytest.mark.skipif(IS_GRAAL, reason="Graal label finding is wonky")
+@pytest.mark.skipif(
+    PYTHON_VERSION_TRIPLE >= (3, 14),
+    reason="Python >= 3.14 is not complete.",
+)
 def test_findlabels():
     code = findlabels.__code__.co_code
     opc = get_opcode_module()
diff --git a/pytest/test_magic.py b/pytest/test_magic.py
@@ -1,8 +1,14 @@
 """
 Unit test for xdis.magics
 """
+import pytest
 from xdis.magics import MAGIC, sysinfo2magic
+from xdis.version_info import PYTHON_VERSION_TRIPLE
 
 
+@pytest.mark.skipif(
+    PYTHON_VERSION_TRIPLE >= (3, 14),
+    reason="Python >= 3.14 is not complete.",
+)
 def test_magic():
     assert sysinfo2magic() == MAGIC, (sysinfo2magic(), MAGIC)
diff --git a/pytest/test_opcode.py b/pytest/test_opcode.py
@@ -1,8 +1,13 @@
 import dis
 
+import pytest
 from xdis import IS_PYPY, PYTHON_VERSION_TRIPLE, get_opcode
 
 
+@pytest.mark.skipif(
+    PYTHON_VERSION_TRIPLE >= (3, 14),
+    reason="Python >= 3.14 is not complete.",
+)
 def test_opcode() -> None:
     opc = get_opcode(PYTHON_VERSION_TRIPLE, IS_PYPY)
     opmap = dict([(k.replace("+", "_"), v) for (k, v) in dis.opmap.items()])
diff --git a/pytest/test_stack_effect.py b/pytest/test_stack_effect.py
@@ -89,6 +89,10 @@ def test_stack_effect_fixed() -> None:
     xdis.PYTHON_VERSION_TRIPLE < (3, 4) or xdis.IS_PYPY or xdis.IS_GRAAL,
     reason="Python version is before 3.4. Can't test",
 )
+@pytest.mark.skipif(
+    xdis.PYTHON_VERSION_TRIPLE >= (3, 14),
+    reason="Python >= 3.14 is not complete.",
+)
 def test_stack_effect_vs_dis() -> None:
     import dis
 
diff --git a/xdis/magics.py b/xdis/magics.py
@@ -98,12 +98,7 @@ def __by_version(magic_versions: Dict[bytes, str]) -> dict:
 magicint2version: Dict[int, str] = {}
 versions: Dict[bytes, str] = {}
 
-try:
-    from importlib.util import MAGIC_NUMBER as MAGIC
-except ImportError:
-    import imp
-
-    MAGIC = imp.get_magic()
+from importlib.util import MAGIC_NUMBER as MAGIC
 
 PYTHON_MAGIC_INT = magic2int(MAGIC)
 
@@ -424,12 +419,25 @@ def __by_version(magic_versions: Dict[bytes, str]) -> dict:
 add_magic_from_int(3531, "3.12.0rc2")
 
 # 3.13
+# Plugin optimizer support
 add_magic_from_int(3550, "3.13a1a")
+
+# Compact superinstructions
 add_magic_from_int(3551, "3.13a1b")
+
+# Remove LOAD_FAST__LOAD_CONST and LOAD_CONST__LOAD_FAST
 add_magic_from_int(3552, "3.13a1c")
+
+# Add SET_FUNCTION_ATTRIBUTE
 add_magic_from_int(3553, "3.13a1d")
+
+# more efficient bytecodes for f-strings
 add_magic_from_int(3554, "3.13a1e")
+
+# generate specialized opcodes metadata from bytecodes.c
 add_magic_from_int(3555, "3.13a1f")
+
+# Convert LOAD_CLOSURE to a pseudo-op
 add_magic_from_int(3556, "3.13a1g")
 add_magic_from_int(3557, "3.13a1h")
 add_magic_from_int(3558, "3.13a1i")
@@ -447,6 +455,81 @@ def __by_version(magic_versions: Dict[bytes, str]) -> dict:
 add_magic_from_int(3570, "3.13a6")
 add_magic_from_int(3571, "3.13.0rc3")
 
+# Add LOAD_COMMON_CONSTANT
+add_magic_from_int(3600, "3.14a1a")
+
+# Fix miscompilation of private names in generic classes
+add_magic_from_int(3601, "3.14a1b")
+
+# Add LOAD_SPECIAL. Remove BEFORE_WITH and BEFORE_ASYNC_WITH
+add_magic_from_int(3602, "3.14a1c")
+
+# Remove BUILD_CONST_KEY_MAP
+add_magic_from_int(3603, "3.14a1d")
+
+# Do not duplicate test at end of while statements
+add_magic_from_int(3604, "3.14a1e")
+
+# Move ENTER_EXECUTOR to opcode 255
+add_magic_from_int(3605, "3.14a1f")
+
+# Specialize CALL_KW
+add_magic_from_int(3606, "3.14a1g")
+
+# Add pseudo instructions JUMP_IF_TRUE/FALSE
+add_magic_from_int(3607, "3.14a1h")
+
+# Add support for slices
+add_magic_from_int(3608, "3.14a1i")
+
+# Add LOAD_SMALL_INT and LOAD_CONST_IMMORTAL instructions, remove RETURN_CONST
+add_magic_from_int(3608, "3.14a2")
+
+# Add VALUE_WITH_FAKE_GLOBALS format to annotationlib
+add_magic_from_int(3610, "3.14a4a")
+
+# Add NOT_TAKEN instruction
+add_magic_from_int(3611, "3.14a4b")
+
+#Add LOAD_CONST_MORTAL instruction
+add_magic_from_int(3613, "3.14a4c")
+
+#Add BINARY_OP_EXTEND
+add_magic_from_int(3614, "3.14a4d")
+
+#Add BINARY_OP_EXTEND
+add_magic_from_int(3615, "3.14a5a")
+
+#Add BINARY_OP_EXTEND
+add_magic_from_int(3616, "3.14a5a")
+
+#Branch monitoring for async for loops
+add_magic_from_int(3617, "3.14a6a")
+
+#Add oparg to END_ASYNC_FOR
+add_magic_from_int(3618, "3.14a6b")
+
+#Renumber RESUME opcode from 149 to 128
+add_magic_from_int(3619, "3.14a6c")
+
+#Optimize bytecode for all/any/tuple called on a genexp
+add_magic_from_int(3620, "3.14a7a")
+
+#Optimize LOAD_FAST opcodes into LOAD_FAST_BORROW
+add_magic_from_int(3621, "3.14a7b")
+
+#Store annotations in different class dict keys
+add_magic_from_int(3622, "3.14a7c")
+
+#Add BUILD_INTERPOLATION & BUILD_TEMPLATE opcodes
+add_magic_from_int(3623, "3.14a7d")
+
+#Don't optimize LOAD_FAST when local is killed by DELETE_FAST
+add_magic_from_int(3624, "3.14b1")
+
+# Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST
+add_magic_from_int(3625, "3.14b3")
+
 # Weird ones
 # WTF? Python 3.2.5 and PyPy have weird magic numbers
 
@@ -595,6 +678,11 @@ def add_canonic_versions(release_versions: str, canonic: str) -> None:
     "3.13.0rc3",
 )
 
+add_canonic_versions(
+    "3.14 3.14-dev",
+    "3.14b3",
+)
+
 # The canonic version for a canonic version is itself
 for v in versions.values():
     canonic_python_version[v] = v
@@ -646,8 +734,8 @@ def py_str2tuple(orig_version: str) -> tuple[int, int] | tuple[int, int, int]:
 
 def sysinfo2magic(version_info=sys.version_info) -> bytes:
     """Convert a list sys.versions_info compatible list into a 'canonic'
-    floating-point number which that can then be used to look up a
-    magic number.  Note that this can raise an exception.
+    The magic bytes value found at the beginning of a bytecode file.
+    b'?!\r\n' is returned if we can't find a version.
     """
 
     vers_str = version_tuple_to_str(version_info)
@@ -671,7 +759,7 @@ def sysinfo2magic(version_info=sys.version_info) -> bytes:
             # just not have platform
             pass
 
-    return magics[vers_str]
+    return magics.get(vers_str, b"?!\r\n")
 
 
 def test() -> None:
diff --git a/xdis/op_imports.py b/xdis/op_imports.py
@@ -1,4 +1,4 @@
-# (C) Copyright 2018-2019, 2021-2023 by Rocky Bernstein
+# (C) Copyright 2018-2019, 2021-2023, 2025 by Rocky Bernstein
 #
 #  This program is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU General Public License
@@ -14,8 +14,6 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from ast import Module
-
 """Facilitates for importing Python opcode maps for a given Python version"""
 import copy
 import sys
@@ -62,6 +60,7 @@
     opcode_311pypy,
     opcode_312,
     opcode_313,
+    opcode_314,
 )
 from xdis.version_info import IS_PYPY, version_tuple_to_str
 
@@ -95,10 +94,13 @@
     2.5: opcode_25,
     "2.5.0dropbox": opcode_25,
     "2.6a1": opcode_26,
+    "2.6pypy": opcode_26pypy,
     2.6: opcode_26,
     "2.7": opcode_27,
     2.7: opcode_27,
     "2.7.18candidate1": opcode_27,
+    "2.7pypy": opcode_27pypy,
+    "2.7.12pypy": opcode_27pypy,
     "3.0": opcode_30,
     3.0: opcode_30,
     "3.0a5": opcode_30,
@@ -108,22 +110,28 @@
     "3.2": opcode_32,
     "3.2a2": opcode_32,
     3.2: opcode_32,
+    "3.2pypy": opcode_32pypy,
     "3.3a4": opcode_33,
     3.3: opcode_33,
+    "3.3pypy": opcode_33pypy,
     "3.4": opcode_34,
     "3.4rc2": opcode_34,
     3.4: opcode_34,
     "3.5": opcode_35,
+    "3.5pypy": opcode_35pypy,
     "3.5.1": opcode_35,
     "3.5.2": opcode_35,
     "3.5.3": opcode_35,
     "3.5.4": opcode_35,
     3.5: opcode_35,
     "3.6rc1": opcode_36,
     3.6: opcode_36,
+    "3.6pypy": opcode_36pypy,
+    "3.6.1pypy": opcode_36pypy,
     "3.7.0beta3": opcode_37,
     "3.7.0.beta3": opcode_37,
     "3.7.0": opcode_37,
+    "3.7pypy": opcode_37pypy,
     3.7: opcode_37,
     "3.8.0alpha0": opcode_38,
     "3.8.0a0": opcode_38,
@@ -133,13 +141,27 @@
     "3.8.0rc1+": opcode_38,
     "3.8.0candidate1": opcode_38,
     "3.8": opcode_38,
+    "3.8.0pypy": opcode_38pypy,
+    "3.8.12pypy": opcode_38pypy,
+    "3.8.13pypy": opcode_38pypy,
+    "3.8.14pypy": opcode_38pypy,
+    "3.8.15pypy": opcode_38pypy,
+    "3.8.16pypy": opcode_38pypy,
+    "3.8.17pypy": opcode_38pypy,
     "3.9.0alpha1": opcode_39,
     "3.9.0alpha2": opcode_39,
     "3.9.0beta5": opcode_39,
     "3.9": opcode_39,
+    "3.9pypy": opcode_39pypy,
+    "3.9.15pypy": opcode_39pypy,
+    "3.9.16pypy": opcode_39pypy,
+    "3.9.17pypy": opcode_39pypy,
+    "3.9.18pypy": opcode_39pypy,
     3.9: opcode_39,
     "3.10.0rc2": opcode_310,
     "3.10": opcode_310,
+    "3.10pypy": opcode_310pypy,
+    "3.10.12pypy": opcode_310pypy,
     "3.11": opcode_311,
     "3.11.0": opcode_311,
     "3.11.1": opcode_311,
@@ -148,34 +170,15 @@
     "3.11.4": opcode_311,
     "3.11.5": opcode_311,
     "3.11a7e": opcode_311,
+    "3.11.13pypy": opcode_311pypy,
+    3.11: opcode_311,
     "3.12.0rc2": opcode_312,
     "3.12.0": opcode_312,
     "3.13.0rc3": opcode_313,
-    "2.6pypy": opcode_26pypy,
-    "2.7pypy": opcode_27pypy,
-    "2.7.12pypy": opcode_27pypy,
-    "3.2pypy": opcode_32pypy,
-    "3.3pypy": opcode_33pypy,
-    "3.5pypy": opcode_35pypy,
-    "3.6pypy": opcode_36pypy,
-    "3.6.1pypy": opcode_36pypy,
-    "3.7pypy": opcode_37pypy,
-    "3.8.0pypy": opcode_38pypy,
-    "3.8pypy": opcode_38pypy,
-    "3.8.12pypy": opcode_38pypy,
-    "3.8.13pypy": opcode_38pypy,
-    "3.8.14pypy": opcode_38pypy,
-    "3.8.15pypy": opcode_38pypy,
-    "3.8.16pypy": opcode_38pypy,
-    "3.8.17pypy": opcode_38pypy,
-    "3.9pypy": opcode_39pypy,
-    "3.9.15pypy": opcode_39pypy,
-    "3.9.16pypy": opcode_39pypy,
-    "3.9.17pypy": opcode_39pypy,
-    "3.9.18pypy": opcode_39pypy,
-    "3.10pypy": opcode_310pypy,
-    "3.10.12pypy": opcode_310pypy,
-    "3.11.13pypy": opcode_311pypy,
+    "3.14b3": opcode_314,
+    "3.14.0": opcode_314,
+    "3.14": opcode_314,
+    3.14: opcode_314,
 }
 
 for k, v in canonic_python_version.items():
