Another pass over RustPython

Add 3.14 testing into mix.

Author: rocky

admin-tools/pyenv-newest-versions

@@ -7,4 +7,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
 fi
 
 # export PYVERSIONS='3.11 pypy3.11 pypy3.11 3.12 3.13'
-export PYVERSIONS='3.11 pypy3.11 graalpy-24.2.2 pypy3.11 3.12 graalpy-community-25.0.0 3.13'
+export PYVERSIONS='3.11 pypy3.11 graalpy-24.2.2 pypy3.11 3.12 graalpy-community-25.0.0 3.13 3.14'

test/bytecode_graal310/.gitignore

@@ -0,0 +1 @@
+/.python-version

test/bytecode_rust-40-313/00_chained-compare.rustpython-313.pyc

@@ -450,11 +450,11 @@ def fix_opcode_names(opmap: dict[str, int]):
     return dict([(k.replace("+", "_"), v) for (k, v) in opmap.items()])
 
 
-def update_pj3(g, loc, is_pypy: bool=False) -> None:
+def update_pj3(g, loc, is_pypy: bool=False, is_rust: bool=False) -> None:
     if loc["version_tuple"] < (3, 11):
         g.update({"PJIF": loc["opmap"]["POP_JUMP_IF_FALSE"]})
         g.update({"PJIT": loc["opmap"]["POP_JUMP_IF_TRUE"]})
-    update_sets(loc, is_pypy)
+    update_sets(loc, is_pypy, is_rust)
 
 
 def update_pj2(g, loc, is_pypy: bool=False) -> None:
@@ -463,7 +463,7 @@ def update_pj2(g, loc, is_pypy: bool=False) -> None:
     update_sets(loc, is_pypy)
 
 
-def update_sets(loc, is_pypy) -> None:
+def update_sets(loc, is_pypy: bool, is_rust=False) -> None:
     """
     Updates various category sets all opcode have been defined.
     """
@@ -482,7 +482,7 @@ def update_sets(loc, is_pypy) -> None:
             [loc["opmap"]["JUMP_ABSOLUTE"], loc["opmap"]["JUMP_FORWARD"]]
         )
     elif python_version:
-        if not is_pypy:
+        if not is_pypy and not is_rust:
             loc["JUMP_UNCONDITIONAL"] = frozenset(
                 [
                     loc["opmap"]["JUMP_FORWARD"],
@@ -498,9 +498,10 @@ def update_sets(loc, is_pypy) -> None:
         loc["LOOP_OPS"] = frozenset()
 
     loc["LOCAL_OPS"] = frozenset(loc["haslocal"])
-    loc["JUMP_OPS"] = (
-        loc["JABS_OPS"] | loc["JREL_OPS"] | loc["LOOP_OPS"] | loc["JUMP_UNCONDITIONAL"]
-    )
+    if not is_rust:
+        loc["JUMP_OPS"] = (
+            loc["JABS_OPS"] | loc["JREL_OPS"] | loc["LOOP_OPS"] | loc["JUMP_UNCONDITIONAL"]
+        )
     loc["NAME_OPS"] = frozenset(loc["hasname"])
     loc["NARGS_OPS"] = frozenset(loc["hasnargs"])
     loc["VARGS_OPS"] = frozenset(loc["hasvargs"])

test/bytecode_rust-40-313/00_if_elif.rustpython-313.pyc

@@ -63,19 +63,22 @@
 # Instruction opcodes for compiled code
 # Blank lines correspond to available opcodes
 
-# If the POP field is -1 and the opcode is var args operation
+# Obsolete: If the POP field is -1 and the opcode is var args operation
 # (hasvargs | hasnargs) operation, then
 # the operand holds the size.
 
+# If an argument is VARYING_STACK_INT, then the number of items
+# pushed or popped varies in stack-dependent data way.
+
 # fmt: off
 
 #                OP NAME        OPCODE POP PUSH
 #-----------------------------------------------
 def_op(loc,   "STOP_CODE",           0,  0,  0, fallthrough=False)
-def_op(loc,   "POP_TOP",             1)
-def_op(loc,   "ROT_TWO",             2)
-def_op(loc,   "ROT_THREE",           3)
-def_op(loc,   "DUP_TOP",             4)
+def_op(loc,   "POP_TOP",             1,  1,  0)
+def_op(loc,   "ROT_TWO",             2,  2,  3)
+def_op(loc,   "ROT_THREE",           3,  3,  3)
+def_op(loc,   "DUP_TOP",             4,  0,  1)
 
 def_op(loc,     "UNARY_POSITIVE",   10)
 unary_op(loc,   "UNARY_NEGATIVE",   11)