Improve support for GraalPython...

Store Python version triple inside each non-native code type!

Author: rocky

xdis/codetype/__init__.py

@@ -30,7 +30,7 @@
 
 __docformat__ = "restructuredtext"
 
-def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
+def codeType2Portable(code, version_triple=PYTHON_VERSION_TRIPLE):
     """Converts a native types.CodeType code object into a
     corresponding more flexible xdis Code type.
     """
@@ -42,8 +42,8 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
         )
     line_table_field = "co_lnotab" if hasattr(code, "co_lnotab") else "co_linetable"
     line_table = getattr(code, line_table_field)
-    if version_tuple >= (3, 0):
-        if version_tuple < (3, 8):
+    if version_triple >= (3, 0):
+        if version_triple < (3, 8):
             return Code3(
                 code.co_argcount,
                 code.co_kwonlyargcount,
@@ -65,8 +65,9 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 # type, should we try to extract it?
                 code.collection_order if hasattr(code, "collection_order") else {},
                 code.reference_objects if hasattr(code, "reference_objects") else set(),
+                version_triple=version_triple,
             )
-        elif version_tuple < (3, 10):
+        elif version_triple < (3, 10):
             return Code38(
                 co_argcount=code.co_argcount,
                 co_posonlyargcount=code.co_posonlyargcount,
@@ -85,7 +86,7 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_firstlineno=code.co_firstlineno,
                 co_lnotab=line_table,
             )
-        elif version_tuple[:2] == (3, 10) or IS_PYPY and version_tuple[:2] == (3, 11):
+        elif version_triple[:2] == (3, 10) or IS_PYPY and version_triple[:2] == (3, 11):
             return Code310(
                 co_argcount=code.co_argcount,
                 co_posonlyargcount=code.co_posonlyargcount,
@@ -104,7 +105,7 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_firstlineno=code.co_firstlineno,
                 co_linetable=line_table,
             )
-        elif version_tuple[:2] >= (3, 11):
+        elif version_triple[:2] >= (3, 11):
             return Code311(
                 co_argcount=code.co_argcount,
                 co_posonlyargcount=code.co_posonlyargcount,
@@ -125,7 +126,7 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
                 co_linetable=line_table,
                 co_exceptiontable=code.co_exceptiontable,
             )
-    elif version_tuple > (2, 0):
+    elif version_triple > (2, 0):
         # 2.0 .. 2.7
         return Code2(
             co_argcount=code.co_argcount,
@@ -151,7 +152,7 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
         )
     else:
         # 1.0 .. 1.5
-        if version_tuple < (1, 5):
+        if version_triple < (1, 5):
             # 1.0 .. 1.3
             return Code13(
                 code.co_argcount,
@@ -181,31 +182,31 @@ def codeType2Portable(code, version_tuple=PYTHON_VERSION_TRIPLE):
             )
 
 
-def portableCodeType(version_tuple=PYTHON_VERSION_TRIPLE):
+def portableCodeType(version_triple=PYTHON_VERSION_TRIPLE):
     """
     Return the portable CodeType version for the supplied Python release version.
     `version` is a floating-point number, like 2.7, or 3.9. If no version
     number is supplied we'll use the current interpreter version.
     """
-    if version_tuple >= (3, 0):
-        if version_tuple < (3, 8):
+    if version_triple >= (3, 0):
+        if version_triple < (3, 8):
             # 3.0 .. 3.7
             return Code3
-        elif version_tuple < (3, 10):
+        elif version_triple < (3, 10):
             # 3.8 ... 3.9
             return Code38
-        elif version_tuple[:2] == (3, 10) or IS_PYPY and version_tuple[:2] == (3, 11):
+        elif version_triple[:2] == (3, 10) or IS_PYPY and version_triple[:2] == (3, 11):
             # 3.10
             return Code310
-        elif version_tuple[:2] >= (3, 11):
+        elif version_triple[:2] >= (3, 11):
             # 3.11 ...
             return Code311
-    elif version_tuple > (2, 0):
+    elif version_triple > (2, 0):
         # 2.0 .. 2.7
         return Code2
     else:
         # 1.0 .. 1.5
-        if version_tuple <= (1, 3):
+        if version_triple <= (1, 3):
             return Code13
         else:
             return Code15
@@ -214,7 +215,7 @@ def portableCodeType(version_tuple=PYTHON_VERSION_TRIPLE):
 # In contrast to Code3, Code2, etc. you can use CodeTypeUnint for building
 # an incomplete code type, which might be converted to another code type
 # later.
-CodeTypeUnionFields = tuple(Code311FieldNames.split() + ["collection_order", "reference_objects"])
+CodeTypeUnionFields = tuple(Code311FieldNames.split() + ["collection_order", "reference_objects", "version_triple"])
 CodeTypeUnion = namedtuple("CodeTypeUnion", CodeTypeUnionFields)
 
 
@@ -265,6 +266,7 @@ def to_portable(
         co_exceptiontable=co_exceptiontable,
         collection_order=collection_order,
         reference_objects=reference_objects,
+        version_triple=version_triple,
     )
     return codeType2Portable(code, version_triple)
 

xdis/codetype/code13.py

@@ -1,4 +1,4 @@
-# (C) Copyright 2020-2021, 2023 by Rocky Bernstein
+# (C) Copyright 2020-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
@@ -15,6 +15,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 from copy import deepcopy
+from typing import Tuple
 
 from xdis.codetype.base import CodeBase
 from xdis.cross_types import UnicodeForPython3
@@ -47,15 +48,16 @@ class Code13(CodeBase):
 
     def __init__(
         self,
-        co_argcount,
-        co_nlocals,
-        co_flags,
+        co_argcount: int,
+        co_nlocals: int,
+        co_flags: int,
         co_code,
         co_consts,
         co_names,
         co_varnames,
         co_filename,
-        co_name,
+        co_name: str,
+        version_triple: Tuple[int, int, int] = (0, 0, 0)
     ) -> None:
         self.co_argcount = co_argcount
         self.co_nlocals = co_nlocals
@@ -67,6 +69,7 @@ def __init__(
         self.co_filename = co_filename
         self.co_name = co_name
         self.fieldtypes = Code13FieldTypes
+        self.version_triple = version_triple
         if type(self) is Code13:
             self.check()
         return

xdis/codetype/code15.py

@@ -15,6 +15,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 from copy import deepcopy
+from typing import Tuple
 
 from xdis.codetype.code13 import Code13, Code13FieldTypes
 
@@ -42,20 +43,21 @@ class Code15(Code13):
 
     def __init__(
         self,
-        co_argcount,
-        co_nlocals,
-        co_stacksize,
-        co_flags,
+        co_argcount: int,
+        co_nlocals: int,
+        co_stacksize: int,
+        co_flags: int,
         co_code,
         co_consts,
         co_names,
         co_varnames,
-        co_filename,
-        co_name,
+        co_filename: str,
+        co_name: str,
         co_firstlineno,
         co_lnotab,
+        version_triple: Tuple[int, int, int] = (0, 0, 0)
     ) -> None:
-        super(Code15, self).__init__(
+        super().__init__(
             co_argcount=co_argcount,
             co_nlocals=co_nlocals,
             co_flags=co_flags,
@@ -65,6 +67,7 @@ def __init__(
             co_varnames=co_varnames,
             co_filename=co_filename,
             co_name=co_name,
+            version_triple=version_triple,
         )
         self.co_stacksize = co_stacksize
         self.co_firstlineno = co_firstlineno

xdis/codetype/code20.py

@@ -72,6 +72,7 @@ def __init__(
         co_cellvars,
         collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},
         reference_objects: Set[Any] = set(),
+        version_triple: Tuple[int, int, int] = (0, 0, 0)
     ) -> None:
         # Keyword argument parameters in the call below is more robust.
         # Since things change around, robustness is good.
@@ -88,6 +89,7 @@ def __init__(
             co_name=co_name,
             co_firstlineno=co_firstlineno,
             co_lnotab=co_lnotab,
+            version_triple=version_triple,
         )
         self.co_freevars = co_freevars
         self.co_cellvars = co_cellvars

xdis/codetype/code30.py

@@ -63,6 +63,7 @@ def __init__(
         co_cellvars,
         collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},
         reference_objects: Set[Any] = set(),
+        version_triple: Tuple[int, int, int] = (0, 0, 0),
     ) -> None:
         # Keyword argument parameters in the call below is more robust.
         # Since things change around, robustness is good.
@@ -83,6 +84,7 @@ def __init__(
             co_cellvars=co_cellvars,
             collection_order=collection_order,
             reference_objects=reference_objects,
+            version_triple=version_triple,
         )
         self.co_kwonlyargcount = co_kwonlyargcount
         self.fieldtypes = Code3FieldTypes

xdis/codetype/code310.py

@@ -17,7 +17,7 @@
 import struct
 import types
 from copy import deepcopy
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Dict, Set, Tuple, Union
 
 from xdis.codetype.code38 import Code38
 from xdis.cross_types import UnicodeForPython3
@@ -97,7 +97,9 @@ def __init__(
         co_linetable,
         co_freevars,
         co_cellvars,
-        collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {}
+        collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},
+        reference_objects: Set[Any] = set(),
+        version_triple: Tuple[int, int, int]  = (0, 0, 0),
     ) -> None:
         # Keyword argument parameters in the call below is more robust.
         # Since things change around, robustness is good.
@@ -118,6 +120,9 @@ def __init__(
         self.co_stacksize = co_stacksize
         self.co_varnames = co_varnames
         self.fieldtypes = Code310FieldTypes
+        self.collection_order = collection_order
+        self.reference_objects: Set = reference_objects
+        self.version_triple = version_triple
 
         # It is helpful to save the order in sets, frozensets and dictionary keys,
         # so that on writing a bytecode file we can duplicate this order.

xdis/codetype/code311.py

@@ -18,7 +18,7 @@
 from copy import deepcopy
 from dataclasses import dataclass
 from types import CodeType
-from typing import Iterable, Iterator, Optional
+from typing import Any, Iterable, Iterator, Optional, Set, Tuple
 
 from xdis.codetype.code310 import Code310, Code310FieldTypes
 from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
@@ -408,10 +408,12 @@ def __init__(
         co_firstlineno,
         co_linetable,
         co_exceptiontable,
+        reference_objects: Set[Any] = set(),
+        version_triple: Tuple[int, int, int] = (0, 0, 0),
     ) -> None:
         # Keyword argument parameters in the call below is more robust.
         # Since things change around, robustness is good.
-        super(Code311, self).__init__(
+        super().__init__(
             co_argcount=co_argcount,
             co_posonlyargcount=co_posonlyargcount,
             co_kwonlyargcount=co_kwonlyargcount,
@@ -428,6 +430,8 @@ def __init__(
             co_linetable=co_linetable,
             co_freevars=co_freevars,
             co_cellvars=co_cellvars,
+            reference_objects = set(),
+            version_triple = (0, 0, 0),
         )
         self.co_qualname = co_qualname
         self.co_exceptiontable = co_exceptiontable

xdis/codetype/code38.py

@@ -16,7 +16,7 @@
 
 import types
 from copy import deepcopy
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Dict, Set, Tuple, Union
 
 from xdis.codetype.code30 import Code3, Code3FieldTypes
 from xdis.version_info import PYTHON_VERSION_TRIPLE, version_tuple_to_str
@@ -84,7 +84,9 @@ def __init__(
         co_lnotab,
         co_freevars,
         co_cellvars,
-        collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {}
+        collection_order: Dict[Union[set, frozenset, dict], Tuple[Any]] = {},
+        reference_objects: Set[Any] = set(),
+        version_triple: Tuple[int, int, int] = (0, 0, 0),
     ) -> None:
         # Keyword argument parameters in the call below is more robust.
         # Since things change around, robustness is good.
@@ -105,6 +107,8 @@ def __init__(
             co_freevars=co_freevars,
             co_cellvars=co_cellvars,
             collection_order = collection_order,
+            reference_objects = set(),
+            version_triple = (0, 0, 0),
         )
         self.co_posonlyargcount = co_posonlyargcount
         self.fieldtypes = Code38FieldTypes

xdis/cross_dis.py

@@ -288,25 +288,21 @@ def format_code_info(
     if file_offset:
         lines.append("# Offset in file:    0x%x" % file_offset[0])
 
-    if not is_graal:
-        if version_tuple >= (1, 3):
-            lines.append("# Argument count:    %s" % co.co_argcount)
+    if version_tuple >= (1, 3):
+        lines.append("# Argument count:    %s" % co.co_argcount)
 
-        if version_tuple >= (3, 8) and hasattr(co, "co_posonlyargcount"):
-            lines.append("# Position-only argument count: %s" % co.co_posonlyargcount)
+    if version_tuple >= (3, 8) and hasattr(co, "co_posonlyargcount"):
+        lines.append("# Position-only argument count: %s" % co.co_posonlyargcount)
 
-        if version_tuple >= (3, 0) and hasattr(co, "co_kwonlyargcount"):
-            lines.append("# Keyword-only arguments: %s" % co.co_kwonlyargcount)
+    if version_tuple >= (3, 0) and hasattr(co, "co_kwonlyargcount"):
+        lines.append("# Keyword-only arguments: %s" % co.co_kwonlyargcount)
 
-        pos_argc = co.co_argcount
-        if version_tuple >= (1, 3):
-            lines.append("# Number of locals:  %s" % co.co_nlocals)
-        if version_tuple >= (1, 5):
-            lines.append("# Stack size:        %s" % co.co_stacksize)
-            pass
+    pos_argc = co.co_argcount
+    if version_tuple >= (1, 3):
+        lines.append("# Number of locals:  %s" % co.co_nlocals)
+    if version_tuple >= (1, 5):
+        lines.append("# Stack size:        %s" % co.co_stacksize)
         pass
-    else:
-        pos_argc = 0
 
     if version_tuple >= (1, 3):
         lines.append(