Merge branch 'graal-disassembly-save' into graal-disassembly

Author: rocky

xdis/disasm.py

@@ -51,18 +51,25 @@
 # FIXME we may also need to distinguish by magic_int2magic
 # (for 3.8.5 Graal for example.)
 def get_opcode(version_tuple: tuple, python_implementation, alternate_opmap=None, magic_int: int=-1):
-
     # Set up disassembler with the right opcodes
     lookup = ".".join((str(i) for i in version_tuple))
     if python_implementation == PythonImplementation.PyPy:
         lookup += "PyPy"
+    elif python_implementation == PythonImplementation.Graal:
+        if magic_int == 21290:
+            if version_tuple == (3, 11, 7):
+                lookup = "3.11.7Graal"
+            else:
+                lookup = "3.12.7Graal"
+        else:
+            lookup += "Graal"
     if lookup in op_imports.keys():
         if alternate_opmap is not None:
             # TODO: change bytecode version number comment line to indicate altered
             return remap_opcodes(op_imports[lookup], alternate_opmap)
         return op_imports[lookup]
-    if python_implementation != PythonImplementation.CPyton:
-        pypy_str = f" for {python_implementation}"
+    if python_implementation != PythonImplementation.CPython:
+        implementation_str = f" for {python_implementation}"
     else:
         implementation_str = ""
     raise TypeError(
@@ -156,8 +163,8 @@ def disco(
         sip_hash,
         header=True,
         show_filename=False,
-        python_implementation=python_implementation)
-
+        python_implementation=python_implementation,
+    )
 
     # Store final output stream when there is an error.
     real_out = out or sys.stdout

xdis/load.py

@@ -358,6 +358,12 @@ def load_module_from_file_object(
     if is_pypy(magic_int, filename):
         python_implementation = PythonImplementation.PyPy
 
+    # Below we need to return co.version_triple instead of version_triple,
+    # because Graal uses the *same* magic number but different bytecode
+    # for Python 3.11 and Python 3.12. What a zoo we have here.
+    if hasattr(co, "version_triple") and co.version_triple != (0, 0, 0):
+        version_triple = co.version_triple
+
     return (
         version_triple,
         timestamp,