Skip to content

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 #111459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 9 commits into from
Nov 2, 2023
Merged

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 #111459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
219e6c1
use RESUME oparg to store exception depth info
iritkatriel Oct 26, 2023
4e68e57
remove the arg from YIELD_VALUE
iritkatriel Oct 26, 2023
801dbd5
add docs
iritkatriel Oct 26, 2023
d449db0
fix test_dis
iritkatriel Oct 26, 2023
c4ed5cf
add news
iritkatriel Oct 26, 2023
8231fef
regen-all
iritkatriel Oct 29, 2023
3c5f157
fix YIELD_FROM and AWAIT
iritkatriel Oct 31, 2023
c385597
use except depth of the yield, not of the resume
iritkatriel Nov 1, 2023
b1394ed
rege-all
iritkatriel Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add docs
  • Loading branch information
@iritkatriel
iritkatriel committed Oct 29, 2023
commit 801dbd52b2be0417ca020e0d644212dc94b934dd
12 changes: 9 additions & 3 deletions Doc/library/dis.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,8 @@ iterations of the loop.
.. versionchanged:: 3.12
oparg set to be the exception block depth, for efficient closing of generators.

.. versionchanged:: 3.13
this opcode no longer has an oparg

.. opcode:: SETUP_ANNOTATIONS

Expand Down Expand Up @@ -1633,12 +1635,16 @@ iterations of the loop.

* ``0`` The start of a function, which is neither a generator, coroutine
nor an async generator
* ``1`` After a ``yield`` expression
* ``2`` After a ``yield from`` expression
* ``3`` After an ``await`` expression
* ``1`` After a ``yield`` expression, with except-depth > 1
* ``2`` After a ``yield`` expression, with except-depth 1
* ``3`` After a ``yield from`` expression
* ``4`` After an ``await`` expression

.. versionadded:: 3.11

.. versionchanged:: 3.13
new oparg value for ``RESUME`` after ``YIELD_VALUE`` with except-depth of 1


.. opcode:: RETURN_GENERATOR

Expand Down
9 changes: 9 additions & 0 deletions Doc/whatsnew/3.13.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,15 @@ Others

* None yet

CPython bytecode changes
========================

* ``YIELD_VALUE`` no longer has an oparg. The set of possible values
for the oparg of ``RESUME`` was changed to add a new value which
identifies a ``RESUME`` that follows a ``YIELD_VALUE`` which is at
except-depth of 1. (This is needed to optimize closing of generators.)
(Contributed by Irit Katriel in :gh:`111354`.)

Porting to Python 3.13
======================

Expand Down
2 changes: 1 addition & 1 deletion Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.13a1 3561 (Add cache entry to branch instructions)
# Python 3.13a1 3562 (Assign opcode IDs for internal ops in separate range)
# Python 3.13a1 3563 (Add CALL_KW and remove KW_NAMES)
# Python 3.13a1 3564 (Shifted some of the oparg values of RESUME to add a new one)
# Python 3.13a1 3564 (Removed oparg from YIELD_VALUE, changed oparg values of RESUME)

# Python 3.14 will start with 3600

Expand Down