Merge pull request #156 from 2elli/python-3.13

Python 3.11 - 3.13 Line number fixes

Author: rocky

xdis/__init__.py

@@ -40,7 +40,6 @@
     Code38,
     Code310,
     Code311,
-    Code313,
     codeType2Portable,
 )
 from xdis.codetype.base import code_has_star_arg, code_has_star_star_arg, iscode
@@ -184,7 +183,6 @@
     "Code3",
     "Code310",
     "Code311",
-    "Code313",
     "Code38",
     "code_has_star_star_arg",
     "code_has_star_arg",

xdis/bytecode.py

@@ -318,6 +318,10 @@ def get_logical_instruction_at_offset(
             #    raw name index for LOAD_GLOBAL, LOAD_CONST, etc.
 
             argval = arg
+
+            # create a localsplusnames table that resolves duplicates.
+            localsplusnames = (varnames or tuple()) + tuple(name for name in (cells or tuple()) if name not in varnames)
+
             if op in opc.CONST_OPS:
                 argval, argrepr = _get_const_info(arg, constants)
             elif op in opc.NAME_OPS:
@@ -340,6 +344,12 @@ def get_logical_instruction_at_offset(
             elif op in opc.JREL_OPS:
                 signed_arg = -arg if "JUMP_BACKWARD" in opname else arg
                 argval = i + get_jump_val(signed_arg, opc.python_version)
+
+                # check cache instructions for python 3.13
+                if opc.version_tuple >= (3, 13):
+                    if opc.opname[op] in ["POP_JUMP_IF_TRUE", "POP_JUMP_IF_FALSE", "POP_JUMP_IF_NONE", "POP_JUMP_IF_NOT_NONE", "JUMP_BACKWARD"]:
+                        argval += 2
+
                 # FOR_ITER has a cache instruction in 3.12
                 if opc.version_tuple >= (3, 12) and opname == "FOR_ITER":
                     argval += 2
@@ -351,28 +361,24 @@ def get_logical_instruction_at_offset(
                 if opc.version_tuple >= (3, 13) and opname in ("LOAD_FAST_LOAD_FAST", "STORE_FAST_LOAD_FAST", "STORE_FAST_STORE_FAST"):
                     arg1 = arg >> 4
                     arg2 = arg & 15
-                    argval1, argrepr1 = _get_name_info(arg1, (varnames or tuple()) + (cells or tuple()))
-                    argval2, argrepr2 = _get_name_info(arg2, (varnames or tuple()) + (cells or tuple()))
+                    argval1, argrepr1 = _get_name_info(arg1, localsplusnames)
+                    argval2, argrepr2 = _get_name_info(arg2, localsplusnames)
                     argval = argval1, argval2
                     argrepr = argrepr1 + ", " + argrepr2
                 elif opc.version_tuple >= (3, 11):
-                    argval, argrepr = _get_name_info(
-                        arg, (varnames or tuple()) + (cells or tuple())
-                    )
+                    argval, argrepr = _get_name_info(arg, localsplusnames)
                 else:
                     argval, argrepr = _get_name_info(arg, varnames)
             elif op in opc.FREE_OPS:
                 if opc.version_tuple >= (3, 11):
-                    argval, argrepr = _get_name_info(
-                        arg, (varnames or tuple()) + (cells or tuple())
-                    )
+                    argval, argrepr = _get_name_info(arg, localsplusnames)
                 else:
                     argval, argrepr = _get_name_info(arg, cells)
             elif op in opc.COMPARE_OPS:
-                if opc.python_version >= (3,13):
+                if opc.python_version >= (3, 13):
                     # The fifth-lowest bit of the oparg now indicates a forced conversion to bool.
                     argval = (opc.cmp_op[arg >> 5])
-                elif opc.python_version >= (3,12):
+                elif opc.python_version >= (3, 12):
                     argval = (opc.cmp_op[arg >> 4])
                 else:
                     argval = (opc.cmp_op[arg])

xdis/codetype/__init__.py

@@ -28,7 +28,7 @@
 from xdis.codetype.code38 import Code38
 from xdis.codetype.code310 import Code310
 from xdis.codetype.code311 import Code311, Code311FieldNames
-from xdis.codetype.code313 import Code313
+from xdis.codetype.code312 import Code312
 from xdis.version_info import PYTHON_VERSION_TRIPLE
 
 
@@ -101,7 +101,7 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_firstlineno=code.co_firstlineno,
                 co_linetable=line_table,
             )
-        elif version_tuple[:2] < (3,13):
+        elif version_tuple[:2] == (3,11):
             return Code311(
                 co_argcount=code.co_argcount,
                 co_posonlyargcount=code.co_posonlyargcount,
@@ -122,8 +122,8 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_linetable=line_table,
                 co_exceptiontable=code.co_exceptiontable,
             )
-        else:  # version tuple >= 3, 13
-            return Code313(
+        elif version_tuple[:2] >= (3,12):
+            return Code312(
                 co_argcount=code.co_argcount,
                 co_posonlyargcount=code.co_posonlyargcount,
                 co_kwonlyargcount=code.co_kwonlyargcount,
@@ -209,11 +209,11 @@ def portableCodeType(version_tuple=PYTHON_VERSION_TRIPLE):
         elif version_tuple[:2] == (3, 10):
             # 3.10
             return Code310
-        elif version_tuple[:2] < (3,13):
+        elif version_tuple[:2] == (3,11):
             # 3.11 ...
             return Code311
-        else:
-            return Code313
+        elif version_tuple[:2] >= (3,12):
+            return Code312
     elif version_tuple > (2, 0):
         # 2.0 .. 2.7
         return Code2