bug fixes...

* decode_linotab() -> decode_lineno_tab_old to make it clear that this
  routine works for version before 3.10
* last instruction can be RERAISE or RASE_VARARGS in addition to
  RETURN_VALUE
* Avoid using asm.code.to_native() for now, since there are bugs

Author: rocky

xasm/assemble.py

@@ -451,7 +451,11 @@ def warn(mess: str):
     print("Warning: ", mess)
 
 
-def decode_lineno_tab(lnotab, first_lineno):
+def decode_lineno_tab_old(lnotab, first_lineno: int) -> dict:
+    """
+    Uncompresses line number table for Python versions before
+    3.10
+    """
     line_number, line_number_diff = first_lineno, 0
     offset, offset_diff = 0, 0
     uncompressed_lnotab = {}
@@ -477,15 +481,15 @@ def decode_lineno_tab(lnotab, first_lineno):
 
 def is_code_ok(asm: Assembler) -> bool:
     """
-    Performs some sanity checks on code
+    Performs some sanity checks on code.
     """
 
     is_valid: bool = True
 
     code = asm.code
     last_instruction = code.instructions[-1]
     last_offset = last_instruction.offset
-    if last_instruction.opname != "RETURN_VALUE":
+    if last_instruction.opname not in ("RETURN_VALUE", "RERAISE", "RAISE_VARARGS"):
         warn(
             f"Last instruction of at offset {last_offset} of {code.co_name}"
             f' should be "RETURN_VALUE", is "{last_instruction.opname}"'
@@ -684,10 +688,10 @@ def create_code(asm: Assembler, label, backpatch):
     is_code_ok(asm)
 
     # Stamp might be added here
-    if asm.python_version[:2] == PYTHON_VERSION_TRIPLE[:2]:
-        code = asm.code.to_native()
-    else:
-        code = asm.code.freeze()
+    # if asm.python_version[:2] == PYTHON_VERSION_TRIPLE[:2]:
+    #     code = asm.code.to_native()
+    # else:
+    code = asm.code.freeze()
 
     # asm.print_instructions()
 

xasm/pyc_convert.py

@@ -14,7 +14,7 @@
 from xdis.opcodes import opcode_27, opcode_33
 
 from xasm.assemble import (Assembler, Instruction, asm_file, create_code,
-                           decode_lineno_tab)
+                           decode_lineno_tab_old)
 from xasm.version import __version__
 from xasm.write_pyc import write_pycfile
 
@@ -159,7 +159,7 @@ def transform_asm(asm, conversion_type, src_version, dest_version):
         new_asm.backpatch.append(copy(asm.backpatch[j]))
         new_asm.label.append(copy(asm.label[j]))
         new_asm.codes.append(copy(code))
-        new_asm.code.co_lnotab = decode_lineno_tab(code.co_lnotab, code.co_firstlineno)
+        new_asm.code.co_lnotab = decode_lineno_tab_old(code.co_lnotab, code.co_firstlineno)
         instructions = asm.codes[j].instructions
         new_asm.code.instructions = []
         i, offset, n = 0, 0, len(instructions)