Fix async generator issue and prefer opcode comparison to name comparison everywhere (#179)

* ci: fix url for release (not sure it really matters)

* tests: add test for async generator

* prefer opcode comparison to name comparison

* update changelog

Author: MatthieuDartiailh

.github/workflows/release.yml

@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: pypi
-      url: https://pypi.org/p/kiwisolver
+      url: https://pypi.org/p/bytecode
     permissions:
       id-token: write
     steps:

doc/changelog.rst

@@ -1,6 +1,15 @@
 ChangeLog
 =========
 
+unreleased: Version 0.18.0
+--------------------------
+
+- drop support for Python 3.9 and 3.10 PR #180
+
+Bugfixes:
+
+- Fix handling of END_ASYNC_FOR which is a backward jump PR #179
+
 03-09-2025: Version 0.17.0
 --------------------------
 

src/bytecode/concrete.py

@@ -29,13 +29,16 @@
     BINARY_OPS,
     BITFLAG2_OPCODES,
     BITFLAG_OPCODES,
+    CACHE_OPCODE,
     COMMON_CONSTANT_OPS,
     DUAL_ARG_OPCODES,
     DUAL_ARG_OPCODES_SINGLE_OPS,
+    EXTENDEDARG_OPCODE,
     FORMAT_VALUE_OPS,
     INTRINSIC,
     INTRINSIC_1OP,
     INTRINSIC_2OP,
+    NOP_OPCODE,
     PLACEHOLDER_LABEL,
     SPECIAL_OPS,
     UNSET,
@@ -614,7 +617,7 @@ def _remove_extended_args(
                 index += 1
                 continue
 
-            if instr.name == "EXTENDED_ARG":
+            if instr._opcode == EXTENDEDARG_OPCODE:
                 nb_extended_args += 1
                 if extended_arg is not None:
                     extended_arg = (extended_arg << 8) + instr.arg
@@ -625,11 +628,15 @@ def _remove_extended_args(
                 continue
 
             if extended_arg is not None:
-                arg = UNSET if instr.name == "NOP" else (extended_arg << 8) + instr.arg
+                arg = (
+                    UNSET
+                    if instr._opcode == NOP_OPCODE
+                    else (extended_arg << 8) + instr.arg
+                )
                 extended_arg = None
 
                 instr = ConcreteInstr(
-                    instr.name,
+                    instr._name,
                     arg,
                     location=instr.location,
                     extended_args=nb_extended_args,
@@ -854,7 +861,7 @@ def to_bytecode(
             # on Python 3.11+ remove CACHE opcodes if we are requested to do so.
             # We are careful to first advance the offset and check that the CACHE
             # is not a jump target. It should never be the case but we double check.
-            if prune_caches and c_instr._name == "CACHE":
+            if prune_caches and c_instr._opcode == CACHE_OPCODE:
                 if jump_target is not None:
                     msg = "cache instruction cannot have jump target"
                     raise ValueError(msg)
@@ -1043,7 +1050,7 @@ def concrete_instructions(self) -> None:
         for instr in itertools.chain(self.bytecode, [None]):
             # Enforce proper use of CACHE opcode on Python 3.11+ by checking we get the
             # number we expect or directly generate the needed ones.
-            if isinstance(instr, Instr) and instr._name == "CACHE":
+            if isinstance(instr, Instr) and instr._opcode == CACHE_OPCODE:
                 if not self.required_caches:
                     raise RuntimeError("Found a CACHE opcode when none was expected.")
                 self.seen_manual_cache = True

src/bytecode/flags.py

@@ -5,7 +5,7 @@
 # alias to keep the 'bytecode' variable free
 import bytecode as _bytecode
 
-from .instr import DUAL_ARG_OPCODES, CellVar, FreeVar
+from .instr import DUAL_ARG_OPCODES, RESUME_OPCODE, CellVar, FreeVar
 from .utils import PY312, PY313, PY314
 
 
@@ -130,7 +130,7 @@ def infer_flags(
                 ),
             ):
                 pass
-            assert ni.name == "RESUME"
+            assert ni._opcode == RESUME_OPCODE
             if (ni.arg & 3) != 3:
                 known_generator = True
             else: