Merge remote-tracking branch 'upstream/py313' into ci/improve-code-co…

…llection
MatthieuDartiailh · Oct 17, 2024 · 4d196ca · 4d196ca
2 parents 8c89b18 + 6d28441
commit 4d196ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/bytecode/concrete.py b/src/bytecode/concrete.py
@@ -989,9 +989,11 @@ def to_bytecode(
             cells_lookup = [CellVar(n) for n in self.cellvars]
 
         # In Python 3.13+ LOAD_FAST can be used to retrieve cell values
-        locals_lookup: Sequence[Union[str, CellVar]]
+        locals_lookup: Sequence[Union[str, CellVar, FreeVar]]
         if PY313:
-            locals_lookup = cells_lookup
+            locals_lookup = cells_lookup + [
+                FreeVar(n) for n in self.freevars if n not in self.varnames
+            ]
         else:
             locals_lookup = self.varnames
 
@@ -1282,6 +1284,9 @@ def concrete_instructions(self) -> None:
                 elif PY313 and isinstance(arg, CellVar):
                     cell_instrs.append(len(self.instructions))
                     arg = self.bytecode.cellvars.index(arg.name)
+                elif PY313 and isinstance(arg, FreeVar):
+                    free_instrs.append(len(self.instructions))
+                    arg = self.bytecode.freevars.index(arg.name)
                 else:
                     assert isinstance(arg, str)
                     arg = self.add(self.varnames, arg)

diff --git a/src/bytecode/instr.py b/src/bytecode/instr.py
@@ -878,8 +878,12 @@ def _check_arg(self, name: str, opcode: int, arg: InstrArg) -> None:
                         "got %s (value=%s)" % (name, type(arg).__name__, str(arg))
                     )
 
-            elif PY313 and opcode in _opcode.haslocal and isinstance(arg, CellVar):
-                # Cell vars can be accessed using locals in Python 3.13+
+            elif (
+                PY313
+                and opcode in _opcode.haslocal
+                and isinstance(arg, (CellVar, FreeVar))
+            ):
+                # Cell and free vars can be accessed using locals in Python 3.13+
                 pass
 
             elif not isinstance(arg, str):