gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 by iritkatriel · Pull Request #111459 · python/cpython · GitHub

gen_close needs to know whether a RESUME follows a YIELD_VALUE which is at except-depth 1, for an important optimization. Currently the compiler stores this information in the oparg of YIELD_VALUE, which requires gen_close to peek into the bytecode (which is unsafe in the debugger). This PR puts this information in the oparg of the RESUME, and removes the oparg of YIELD_VALUE. The result is simpler and safer code in gen_close.

It also removes an anomaly in the bytecode definitions, where we needed to add a meaningless assertion to make the code generator understand that YIELD_VALUE has an oparg even though it doesn't use it.

Issue: remove hacks in genobject.c #111354

📚 Documentation preview 📚: https://cpython-previews--111459.org.readthedocs.build/

Doesn't this mean we lose the optimization for yield from and await, as they always take the slow path when being closed?
Maybe use the low bit for except depth and the higher bits to distinguish between the type of yield/await?

Looks good

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 FreeBSD 3.x has failed when building commit 52cc4af.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/1223/builds/649) and take a look at the build logs.
Check if the failure is related to this commit (52cc4af) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/1223/builds/649

Summary of the results of the build (if available):

==

Click to see traceback logs

remote: Enumerating objects: 68, done.        
remote: Counting objects:   1% (1/68)        
remote: Counting objects:   2% (2/68)        
remote: Counting objects:   4% (3/68)        
remote: Counting objects:   5% (4/68)        
remote: Counting objects:   7% (5/68)        
remote: Counting objects:   8% (6/68)        
remote: Counting objects:  10% (7/68)        
remote: Counting objects:  11% (8/68)        
remote: Counting objects:  13% (9/68)        
remote: Counting objects:  14% (10/68)        
remote: Counting objects:  16% (11/68)        
remote: Counting objects:  17% (12/68)        
remote: Counting objects:  19% (13/68)        
remote: Counting objects:  20% (14/68)        
remote: Counting objects:  22% (15/68)        
remote: Counting objects:  23% (16/68)        
remote: Counting objects:  25% (17/68)        
remote: Counting objects:  26% (18/68)        
remote: Counting objects:  27% (19/68)        
remote: Counting objects:  29% (20/68)        
remote: Counting objects:  30% (21/68)        
remote: Counting objects:  32% (22/68)        
remote: Counting objects:  33% (23/68)        
remote: Counting objects:  35% (24/68)        
remote: Counting objects:  36% (25/68)        
remote: Counting objects:  38% (26/68)        
remote: Counting objects:  39% (27/68)        
remote: Counting objects:  41% (28/68)        
remote: Counting objects:  42% (29/68)        
remote: Counting objects:  44% (30/68)        
remote: Counting objects:  45% (31/68)        
remote: Counting objects:  47% (32/68)        
remote: Counting objects:  48% (33/68)        
remote: Counting objects:  50% (34/68)        
remote: Counting objects:  51% (35/68)        
remote: Counting objects:  52% (36/68)        
remote: Counting objects:  54% (37/68)        
remote: Counting objects:  55% (38/68)        
remote: Counting objects:  57% (39/68)        
remote: Counting objects:  58% (40/68)        
remote: Counting objects:  60% (41/68)        
remote: Counting objects:  61% (42/68)        
remote: Counting objects:  63% (43/68)        
remote: Counting objects:  64% (44/68)        
remote: Counting objects:  66% (45/68)        
remote: Counting objects:  67% (46/68)        
remote: Counting objects:  69% (47/68)        
remote: Counting objects:  70% (48/68)        
remote: Counting objects:  72% (49/68)        
remote: Counting objects:  73% (50/68)        
remote: Counting objects:  75% (51/68)        
remote: Counting objects:  76% (52/68)        
remote: Counting objects:  77% (53/68)        
remote: Counting objects:  79% (54/68)        
remote: Counting objects:  80% (55/68)        
remote: Counting objects:  82% (56/68)        
remote: Counting objects:  83% (57/68)        
remote: Counting objects:  85% (58/68)        
remote: Counting objects:  86% (59/68)        
remote: Counting objects:  88% (60/68)        
remote: Counting objects:  89% (61/68)        
remote: Counting objects:  91% (62/68)        
remote: Counting objects:  92% (63/68)        
remote: Counting objects:  94% (64/68)        
remote: Counting objects:  95% (65/68)        
remote: Counting objects:  97% (66/68)        
remote: Counting objects:  98% (67/68)        
remote: Counting objects: 100% (68/68)        
remote: Counting objects: 100% (68/68), done.        
remote: Compressing objects:   3% (1/33)        
remote: Compressing objects:   6% (2/33)        
remote: Compressing objects:   9% (3/33)        
remote: Compressing objects:  12% (4/33)        
remote: Compressing objects:  15% (5/33)        
remote: Compressing objects:  18% (6/33)        
remote: Compressing objects:  21% (7/33)        
remote: Compressing objects:  24% (8/33)        
remote: Compressing objects:  27% (9/33)        
remote: Compressing objects:  30% (10/33)        
remote: Compressing objects:  33% (11/33)        
remote: Compressing objects:  36% (12/33)        
remote: Compressing objects:  39% (13/33)        
remote: Compressing objects:  42% (14/33)        
remote: Compressing objects:  45% (15/33)        
remote: Compressing objects:  48% (16/33)        
remote: Compressing objects:  51% (17/33)        
remote: Compressing objects:  54% (18/33)        
remote: Compressing objects:  57% (19/33)        
remote: Compressing objects:  60% (20/33)        
remote: Compressing objects:  63% (21/33)        
remote: Compressing objects:  66% (22/33)        
remote: Compressing objects:  69% (23/33)        
remote: Compressing objects:  72% (24/33)        
remote: Compressing objects:  75% (25/33)        
remote: Compressing objects:  78% (26/33)        
remote: Compressing objects:  81% (27/33)        
remote: Compressing objects:  84% (28/33)        
remote: Compressing objects:  87% (29/33)        
remote: Compressing objects:  90% (30/33)        
remote: Compressing objects:  93% (31/33)        
remote: Compressing objects:  96% (32/33)        
remote: Compressing objects: 100% (33/33)        
remote: Compressing objects: 100% (33/33), done.        
remote: Total 35 (delta 33), reused 3 (delta 2), pack-reused 0        
From https://github.com/python/cpython
 * branch                  main       -> FETCH_HEAD
Note: switching to '52cc4af6ae9002f11605f91b672746c127494efd'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 52cc4af6ae gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1  (#111459)
Switched to and reset branch 'main'

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot aarch64 Debian Clang LTO + PGO 3.x has failed when building commit 52cc4af.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/1084/builds/2489) and take a look at the build logs.
Check if the failure is related to this commit (52cc4af) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/1084/builds/2489

Summary of the results of the build (if available):

==

Click to see traceback logs

remote: Enumerating objects: 68, done.        
remote: Counting objects:   1% (1/68)        
remote: Counting objects:   2% (2/68)        
remote: Counting objects:   4% (3/68)        
remote: Counting objects:   5% (4/68)        
remote: Counting objects:   7% (5/68)        
remote: Counting objects:   8% (6/68)        
remote: Counting objects:  10% (7/68)        
remote: Counting objects:  11% (8/68)        
remote: Counting objects:  13% (9/68)        
remote: Counting objects:  14% (10/68)        
remote: Counting objects:  16% (11/68)        
remote: Counting objects:  17% (12/68)        
remote: Counting objects:  19% (13/68)        
remote: Counting objects:  20% (14/68)        
remote: Counting objects:  22% (15/68)        
remote: Counting objects:  23% (16/68)        
remote: Counting objects:  25% (17/68)        
remote: Counting objects:  26% (18/68)        
remote: Counting objects:  27% (19/68)        
remote: Counting objects:  29% (20/68)        
remote: Counting objects:  30% (21/68)        
remote: Counting objects:  32% (22/68)        
remote: Counting objects:  33% (23/68)        
remote: Counting objects:  35% (24/68)        
remote: Counting objects:  36% (25/68)        
remote: Counting objects:  38% (26/68)        
remote: Counting objects:  39% (27/68)        
remote: Counting objects:  41% (28/68)        
remote: Counting objects:  42% (29/68)        
remote: Counting objects:  44% (30/68)        
remote: Counting objects:  45% (31/68)        
remote: Counting objects:  47% (32/68)        
remote: Counting objects:  48% (33/68)        
remote: Counting objects:  50% (34/68)        
remote: Counting objects:  51% (35/68)        
remote: Counting objects:  52% (36/68)        
remote: Counting objects:  54% (37/68)        
remote: Counting objects:  55% (38/68)        
remote: Counting objects:  57% (39/68)        
remote: Counting objects:  58% (40/68)        
remote: Counting objects:  60% (41/68)        
remote: Counting objects:  61% (42/68)        
remote: Counting objects:  63% (43/68)        
remote: Counting objects:  64% (44/68)        
remote: Counting objects:  66% (45/68)        
remote: Counting objects:  67% (46/68)        
remote: Counting objects:  69% (47/68)        
remote: Counting objects:  70% (48/68)        
remote: Counting objects:  72% (49/68)        
remote: Counting objects:  73% (50/68)        
remote: Counting objects:  75% (51/68)        
remote: Counting objects:  76% (52/68)        
remote: Counting objects:  77% (53/68)        
remote: Counting objects:  79% (54/68)        
remote: Counting objects:  80% (55/68)        
remote: Counting objects:  82% (56/68)        
remote: Counting objects:  83% (57/68)        
remote: Counting objects:  85% (58/68)        
remote: Counting objects:  86% (59/68)        
remote: Counting objects:  88% (60/68)        
remote: Counting objects:  89% (61/68)        
remote: Counting objects:  91% (62/68)        
remote: Counting objects:  92% (63/68)        
remote: Counting objects:  94% (64/68)        
remote: Counting objects:  95% (65/68)        
remote: Counting objects:  97% (66/68)        
remote: Counting objects:  98% (67/68)        
remote: Counting objects: 100% (68/68)        
remote: Counting objects: 100% (68/68), done.        
remote: Compressing objects:   3% (1/33)        
remote: Compressing objects:   6% (2/33)        
remote: Compressing objects:   9% (3/33)        
remote: Compressing objects:  12% (4/33)        
remote: Compressing objects:  15% (5/33)        
remote: Compressing objects:  18% (6/33)        
remote: Compressing objects:  21% (7/33)        
remote: Compressing objects:  24% (8/33)        
remote: Compressing objects:  27% (9/33)        
remote: Compressing objects:  30% (10/33)        
remote: Compressing objects:  33% (11/33)        
remote: Compressing objects:  36% (12/33)        
remote: Compressing objects:  39% (13/33)        
remote: Compressing objects:  42% (14/33)        
remote: Compressing objects:  45% (15/33)        
remote: Compressing objects:  48% (16/33)        
remote: Compressing objects:  51% (17/33)        
remote: Compressing objects:  54% (18/33)        
remote: Compressing objects:  57% (19/33)        
remote: Compressing objects:  60% (20/33)        
remote: Compressing objects:  63% (21/33)        
remote: Compressing objects:  66% (22/33)        
remote: Compressing objects:  69% (23/33)        
remote: Compressing objects:  72% (24/33)        
remote: Compressing objects:  75% (25/33)        
remote: Compressing objects:  78% (26/33)        
remote: Compressing objects:  81% (27/33)        
remote: Compressing objects:  84% (28/33)        
remote: Compressing objects:  87% (29/33)        
remote: Compressing objects:  90% (30/33)        
remote: Compressing objects:  93% (31/33)        
remote: Compressing objects:  96% (32/33)        
remote: Compressing objects: 100% (33/33)        
remote: Compressing objects: 100% (33/33), done.        
remote: Total 35 (delta 33), reused 3 (delta 2), pack-reused 0        
From https://github.com/python/cpython
 * branch                  main       -> FETCH_HEAD
Note: switching to '52cc4af6ae9002f11605f91b672746c127494efd'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 52cc4af6ae gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1  (#111459)
Switched to and reset branch 'main'

find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
make[2]: [Makefile:2846: clean-retain-profile] Error 1 (ignored)
Python/ceval_gil.c:429:1: warning: unused function 'current_thread_holds_gil' [-Wunused-function]
current_thread_holds_gil(struct _gil_runtime_state *gil, PyThreadState *tstate)
^
1 warning generated.
Python/optimizer.c:428:9: warning: variable 'reserved' set but not used [-Wunused-but-set-variable]
    int reserved = 0;
        ^
1 warning generated.
./Modules/expat/xmlparse.c:3116:9: warning: code will never be executed [-Wunreachable-code]
        parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf,
        ^~~~~~
./Modules/expat/xmlparse.c:3115:16: note: silence by adding parentheses to mark code as explicitly dead
      else if (0 && parser->m_characterDataHandler)
               ^
               /* DISABLES CODE */ ( )
./Modules/expat/xmlparse.c:4059:9: warning: code will never be executed [-Wunreachable-code]
        parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf,
        ^~~~~~
./Modules/expat/xmlparse.c:4058:16: note: silence by adding parentheses to mark code as explicitly dead
      else if (0 && parser->m_characterDataHandler)
               ^
               /* DISABLES CODE */ ( )
2 warnings generated.
Python/ceval_gil.c:429:1: warning: unused function 'current_thread_holds_gil' [-Wunused-function]
current_thread_holds_gil(struct _gil_runtime_state *gil, PyThreadState *tstate)
^
1 warning generated.
Python/optimizer.c:428:9: warning: variable 'reserved' set but not used [-Wunused-but-set-variable]
    int reserved = 0;
        ^
1 warning generated.
warning: warning: no profile data available for file "_freeze_module.c" [-Wprofile-instr-unprofiled]
no profile data available for file "getpath_noop.c" [-Wprofile-instr-unprofiled]
1 warning generated.
1 warning generated.
warning: no profile data available for file "_csv.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "rotatingtree.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_lsprof.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_xxsubinterpretersmodule.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_xxinterpchannelsmodule.c" [-Wprofile-instr-unprofiled]
warning: no profile data available for file "_zoneinfo.c" [-Wprofile-instr-unprofiled]
1 warning generated.
1 warning generated.
./Modules/expat/xmlparse.c:3116:9: warning: code will never be executed [-Wunreachable-code]
        parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf,
        ^~~~~~
./Modules/expat/xmlparse.c:3115:16: note: silence by adding parentheses to mark code as explicitly dead
      else if (0 && parser->m_characterDataHandler)
               ^
               /* DISABLES CODE */ ( )
./Modules/expat/xmlparse.c:4059:9: warning: code will never be executed [-Wunreachable-code]
        parser->m_characterDataHandler(parser->m_handlerArg, parser->m_dataBuf,
        ^~~~~~
./Modules/expat/xmlparse.c:4058:16: note: silence by adding parentheses to mark code as explicitly dead
      else if (0 && parser->m_characterDataHandler)
               ^
               /* DISABLES CODE */ ( )
2 warnings generated.
warning: no profile data available for file "mmapmodule.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "syslogmodule.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "posixshmem.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_curses_panel.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_cursesmodule.c" [-Wprofile-instr-unprofiled]
warning: no profile data available for file "_uuidmodule.c" [-Wprofile-instr-unprofiled]
1 warning generated.
1 warning generated.
warning: no profile data available for file "_xxtestfuzz.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "xxsubtype.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "fuzzer.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_testclinic_limited.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_testimportmultiple.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_testsinglephase.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "_testmultiphase.c" [-Wprofile-instr-unprofiled]
warning: 1no profile data available for file "_ctypes_test.c" [-Wprofile-instr-unprofiled]
 warning generated.
warning: no profile data available for file "xxlimited.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: no profile data available for file "xxlimited_35.c" [-Wprofile-instr-unprofiled]
1 warning generated.
1 warning generated.
warning: no profile data available for file "_testclinic.c" [-Wprofile-instr-unprofiled]
1 warning generated.
warning: profile data may be out of date: of 3 functions, 1 has mismatched data that will be ignored [-Wprofile-instr-out-of-date]
1 warning generated.

make: *** [Makefile:2067: buildbottest] Error 3

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot x86-64 macOS 3.x has failed when building commit 52cc4af.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/366/builds/5795) and take a look at the build logs.
Check if the failure is related to this commit (52cc4af) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/366/builds/5795

Summary of the results of the build (if available):

==

Click to see traceback logs

remote: Enumerating objects: 68, done.        
remote: Counting objects:   1% (1/68)        
remote: Counting objects:   2% (2/68)        
remote: Counting objects:   4% (3/68)        
remote: Counting objects:   5% (4/68)        
remote: Counting objects:   7% (5/68)        
remote: Counting objects:   8% (6/68)        
remote: Counting objects:  10% (7/68)        
remote: Counting objects:  11% (8/68)        
remote: Counting objects:  13% (9/68)        
remote: Counting objects:  14% (10/68)        
remote: Counting objects:  16% (11/68)        
remote: Counting objects:  17% (12/68)        
remote: Counting objects:  19% (13/68)        
remote: Counting objects:  20% (14/68)        
remote: Counting objects:  22% (15/68)        
remote: Counting objects:  23% (16/68)        
remote: Counting objects:  25% (17/68)        
remote: Counting objects:  26% (18/68)        
remote: Counting objects:  27% (19/68)        
remote: Counting objects:  29% (20/68)        
remote: Counting objects:  30% (21/68)        
remote: Counting objects:  32% (22/68)        
remote: Counting objects:  33% (23/68)        
remote: Counting objects:  35% (24/68)        
remote: Counting objects:  36% (25/68)        
remote: Counting objects:  38% (26/68)        
remote: Counting objects:  39% (27/68)        
remote: Counting objects:  41% (28/68)        
remote: Counting objects:  42% (29/68)        
remote: Counting objects:  44% (30/68)        
remote: Counting objects:  45% (31/68)        
remote: Counting objects:  47% (32/68)        
remote: Counting objects:  48% (33/68)        
remote: Counting objects:  50% (34/68)        
remote: Counting objects:  51% (35/68)        
remote: Counting objects:  52% (36/68)        
remote: Counting objects:  54% (37/68)        
remote: Counting objects:  55% (38/68)        
remote: Counting objects:  57% (39/68)        
remote: Counting objects:  58% (40/68)        
remote: Counting objects:  60% (41/68)        
remote: Counting objects:  61% (42/68)        
remote: Counting objects:  63% (43/68)        
remote: Counting objects:  64% (44/68)        
remote: Counting objects:  66% (45/68)        
remote: Counting objects:  67% (46/68)        
remote: Counting objects:  69% (47/68)        
remote: Counting objects:  70% (48/68)        
remote: Counting objects:  72% (49/68)        
remote: Counting objects:  73% (50/68)        
remote: Counting objects:  75% (51/68)        
remote: Counting objects:  76% (52/68)        
remote: Counting objects:  77% (53/68)        
remote: Counting objects:  79% (54/68)        
remote: Counting objects:  80% (55/68)        
remote: Counting objects:  82% (56/68)        
remote: Counting objects:  83% (57/68)        
remote: Counting objects:  85% (58/68)        
remote: Counting objects:  86% (59/68)        
remote: Counting objects:  88% (60/68)        
remote: Counting objects:  89% (61/68)        
remote: Counting objects:  91% (62/68)        
remote: Counting objects:  92% (63/68)        
remote: Counting objects:  94% (64/68)        
remote: Counting objects:  95% (65/68)        
remote: Counting objects:  97% (66/68)        
remote: Counting objects:  98% (67/68)        
remote: Counting objects: 100% (68/68)        
remote: Counting objects: 100% (68/68), done.        
remote: Compressing objects:   3% (1/33)        
remote: Compressing objects:   6% (2/33)        
remote: Compressing objects:   9% (3/33)        
remote: Compressing objects:  12% (4/33)        
remote: Compressing objects:  15% (5/33)        
remote: Compressing objects:  18% (6/33)        
remote: Compressing objects:  21% (7/33)        
remote: Compressing objects:  24% (8/33)        
remote: Compressing objects:  27% (9/33)        
remote: Compressing objects:  30% (10/33)        
remote: Compressing objects:  33% (11/33)        
remote: Compressing objects:  36% (12/33)        
remote: Compressing objects:  39% (13/33)        
remote: Compressing objects:  42% (14/33)        
remote: Compressing objects:  45% (15/33)        
remote: Compressing objects:  48% (16/33)        
remote: Compressing objects:  51% (17/33)        
remote: Compressing objects:  54% (18/33)        
remote: Compressing objects:  57% (19/33)        
remote: Compressing objects:  60% (20/33)        
remote: Compressing objects:  63% (21/33)        
remote: Compressing objects:  66% (22/33)        
remote: Compressing objects:  69% (23/33)        
remote: Compressing objects:  72% (24/33)        
remote: Compressing objects:  75% (25/33)        
remote: Compressing objects:  78% (26/33)        
remote: Compressing objects:  81% (27/33)        
remote: Compressing objects:  84% (28/33)        
remote: Compressing objects:  87% (29/33)        
remote: Compressing objects:  90% (30/33)        
remote: Compressing objects:  93% (31/33)        
remote: Compressing objects:  96% (32/33)        
remote: Compressing objects: 100% (33/33)        
remote: Compressing objects: 100% (33/33), done.        
remote: Total 35 (delta 33), reused 3 (delta 2), pack-reused 0        
From https://github.com/python/cpython
 * branch                  main       -> FETCH_HEAD
Note: switching to '52cc4af6ae9002f11605f91b672746c127494efd'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 52cc4af6ae gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1  (#111459)
Switched to and reset branch 'main'

configure: WARNING: pkg-config is missing. Some dependencies may not be detected correctly.

/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libpython3.13d.a(dynamic_annotations.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libpython3.13d.a(pymath.o) has no symbols
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups

make: *** [buildbottest] Error 3

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 Debian root 3.x has failed when building commit 52cc4af.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/345/builds/6230) and take a look at the build logs.
Check if the failure is related to this commit (52cc4af) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/345/builds/6230

Summary of the results of the build (if available):

==

Click to see traceback logs

remote: Enumerating objects: 76, done.        
remote: Counting objects:   1% (1/76)        
remote: Counting objects:   2% (2/76)        
remote: Counting objects:   3% (3/76)        
remote: Counting objects:   5% (4/76)        
remote: Counting objects:   6% (5/76)        
remote: Counting objects:   7% (6/76)        
remote: Counting objects:   9% (7/76)        
remote: Counting objects:  10% (8/76)        
remote: Counting objects:  11% (9/76)        
remote: Counting objects:  13% (10/76)        
remote: Counting objects:  14% (11/76)        
remote: Counting objects:  15% (12/76)        
remote: Counting objects:  17% (13/76)        
remote: Counting objects:  18% (14/76)        
remote: Counting objects:  19% (15/76)        
remote: Counting objects:  21% (16/76)        
remote: Counting objects:  22% (17/76)        
remote: Counting objects:  23% (18/76)        
remote: Counting objects:  25% (19/76)        
remote: Counting objects:  26% (20/76)        
remote: Counting objects:  27% (21/76)        
remote: Counting objects:  28% (22/76)        
remote: Counting objects:  30% (23/76)        
remote: Counting objects:  31% (24/76)        
remote: Counting objects:  32% (25/76)        
remote: Counting objects:  34% (26/76)        
remote: Counting objects:  35% (27/76)        
remote: Counting objects:  36% (28/76)        
remote: Counting objects:  38% (29/76)        
remote: Counting objects:  39% (30/76)        
remote: Counting objects:  40% (31/76)        
remote: Counting objects:  42% (32/76)        
remote: Counting objects:  43% (33/76)        
remote: Counting objects:  44% (34/76)        
remote: Counting objects:  46% (35/76)        
remote: Counting objects:  47% (36/76)        
remote: Counting objects:  48% (37/76)        
remote: Counting objects:  50% (38/76)        
remote: Counting objects:  51% (39/76)        
remote: Counting objects:  52% (40/76)        
remote: Counting objects:  53% (41/76)        
remote: Counting objects:  55% (42/76)        
remote: Counting objects:  56% (43/76)        
remote: Counting objects:  57% (44/76)        
remote: Counting objects:  59% (45/76)        
remote: Counting objects:  60% (46/76)        
remote: Counting objects:  61% (47/76)        
remote: Counting objects:  63% (48/76)        
remote: Counting objects:  64% (49/76)        
remote: Counting objects:  65% (50/76)        
remote: Counting objects:  67% (51/76)        
remote: Counting objects:  68% (52/76)        
remote: Counting objects:  69% (53/76)        
remote: Counting objects:  71% (54/76)        
remote: Counting objects:  72% (55/76)        
remote: Counting objects:  73% (56/76)        
remote: Counting objects:  75% (57/76)        
remote: Counting objects:  76% (58/76)        
remote: Counting objects:  77% (59/76)        
remote: Counting objects:  78% (60/76)        
remote: Counting objects:  80% (61/76)        
remote: Counting objects:  81% (62/76)        
remote: Counting objects:  82% (63/76)        
remote: Counting objects:  84% (64/76)        
remote: Counting objects:  85% (65/76)        
remote: Counting objects:  86% (66/76)        
remote: Counting objects:  88% (67/76)        
remote: Counting objects:  89% (68/76)        
remote: Counting objects:  90% (69/76)        
remote: Counting objects:  92% (70/76)        
remote: Counting objects:  93% (71/76)        
remote: Counting objects:  94% (72/76)        
remote: Counting objects:  96% (73/76)        
remote: Counting objects:  97% (74/76)        
remote: Counting objects:  98% (75/76)        
remote: Counting objects: 100% (76/76)        
remote: Counting objects: 100% (76/76), done.        
remote: Compressing objects:   2% (1/35)        
remote: Compressing objects:   5% (2/35)        
remote: Compressing objects:   8% (3/35)        
remote: Compressing objects:  11% (4/35)        
remote: Compressing objects:  14% (5/35)        
remote: Compressing objects:  17% (6/35)        
remote: Compressing objects:  20% (7/35)        
remote: Compressing objects:  22% (8/35)        
remote: Compressing objects:  25% (9/35)        
remote: Compressing objects:  28% (10/35)        
remote: Compressing objects:  31% (11/35)        
remote: Compressing objects:  34% (12/35)        
remote: Compressing objects:  37% (13/35)        
remote: Compressing objects:  40% (14/35)        
remote: Compressing objects:  42% (15/35)        
remote: Compressing objects:  45% (16/35)        
remote: Compressing objects:  48% (17/35)        
remote: Compressing objects:  51% (18/35)        
remote: Compressing objects:  54% (19/35)        
remote: Compressing objects:  57% (20/35)        
remote: Compressing objects:  60% (21/35)        
remote: Compressing objects:  62% (22/35)        
remote: Compressing objects:  65% (23/35)        
remote: Compressing objects:  68% (24/35)        
remote: Compressing objects:  71% (25/35)        
remote: Compressing objects:  74% (26/35)        
remote: Compressing objects:  77% (27/35)        
remote: Compressing objects:  80% (28/35)        
remote: Compressing objects:  82% (29/35)        
remote: Compressing objects:  85% (30/35)        
remote: Compressing objects:  88% (31/35)        
remote: Compressing objects:  91% (32/35)        
remote: Compressing objects:  94% (33/35)        
remote: Compressing objects:  97% (34/35)        
remote: Compressing objects: 100% (35/35)        
remote: Compressing objects: 100% (35/35), done.        
remote: Total 40 (delta 37), reused 6 (delta 5), pack-reused 0        
From https://github.com/python/cpython
 * branch                  main       -> FETCH_HEAD
Note: switching to '52cc4af6ae9002f11605f91b672746c127494efd'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 52cc4af6ae gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1  (#111459)
Switched to and reset branch 'main'

configure: WARNING: pkg-config is missing. Some dependencies may not be detected correctly.

make: *** [Makefile:2061: buildbottest] Error 3

…cept-depth 1 (python#111459)

iritkatriel added 6 commits October 29, 2023 13:25

use RESUME oparg to store exception depth info

219e6c1

remove the arg from YIELD_VALUE

4e68e57

add docs

801dbd5

fix test_dis

d449db0

add news

c4ed5cf

regen-all

8231fef

iritkatriel requested review from brettcannon, ericsnowcurrently, markshannon, ncoghlan and warsaw as code owners October 29, 2023 13:35

bedevere-app Bot mentioned this pull request Oct 29, 2023

remove hacks in genobject.c #111354

Closed

bedevere-app Bot added the awaiting core review label Oct 29, 2023

iritkatriel removed the request for review from brettcannon October 29, 2023 13:36

iritkatriel added 3 commits October 31, 2023 17:23

fix YIELD_FROM and AWAIT

3c5f157

use except depth of the yield, not of the resume

c385597

rege-all

b1394ed

markshannon approved these changes Nov 2, 2023

View reviewed changes

bedevere-app Bot added awaiting merge and removed awaiting core review labels Nov 2, 2023

iritkatriel merged commit 52cc4af into python:main Nov 2, 2023

bedevere-app Bot removed the awaiting merge label Nov 2, 2023

FullteaR pushed a commit to FullteaR/cpython that referenced this pull request Nov 3, 2023

pythongh-111354 : simplify detection of RESUME after YIELD_VALUE at ex…

62f9e8b

…cept-depth 1 (python#111459)

aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024

pythongh-111354 : simplify detection of RESUME after YIELD_VALUE at ex…

21ec8af

…cept-depth 1 (python#111459)

eevelweezel mentioned this pull request Mar 7, 2024

12061 make twisted.internet.test.test_inlinecb.py compatible with Python 3.13 twisted/twisted#12092

Closed

mgorny mentioned this pull request Jun 1, 2024

[3.12] Lambda generators cause assertion failure: python: Objects/genobject.c:400: gen_close: Assertion exception_handler_depth > 0' failed.` #119897

Closed

iritkatriel mentioned this pull request Jun 13, 2024

[3.12] gh-119897: Revert buggy optimization which was removed in 3.13 #120467

Merged

Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024

pythongh-111354 : simplify detection of RESUME after YIELD_VALUE at ex…

40e08f3

…cept-depth 1 (python#111459)

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 by iritkatriel · Pull Request #111459 · python/cpython · GitHub

Uh oh!

Uh oh!

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

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 #111459
iritkatriel merged 9 commits into
python:mainfrom
iritkatriel:gen_close

iritkatriel commented Oct 29, 2023 •
edited by github-actions Bot
Loading

Uh oh!

Uh oh!

markshannon commented Oct 30, 2023 •
edited
Loading

Uh oh!

Uh oh!

markshannon left a comment

Uh oh!

bedevere-bot commented Nov 2, 2023

Uh oh!

bedevere-bot commented Nov 2, 2023

Uh oh!

bedevere-bot commented Nov 2, 2023

Uh oh!

bedevere-bot commented Nov 2, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 by iritkatriel · Pull Request #111459 · python/cpython · GitHub

Uh oh!

Uh oh!

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

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 #111459iritkatriel merged 9 commits intopython:mainpython/cpython:mainfrom iritkatriel:gen_closeiritkatriel/cpython:gen_closeCopy head branch name to clipboard

Conversation

iritkatriel commented Oct 29, 2023 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

markshannon commented Oct 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

markshannon left a comment

Choose a reason for hiding this comment

Uh oh!

bedevere-bot commented Nov 2, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

bedevere-bot commented Nov 2, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

bedevere-bot commented Nov 2, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

bedevere-bot commented Nov 2, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

gh-111354: simplify detection of RESUME after YIELD_VALUE at except-depth 1 #111459
iritkatriel merged 9 commits into
python:mainfrom
iritkatriel:gen_close

iritkatriel commented Oct 29, 2023 •
edited by github-actions Bot
Loading

markshannon commented Oct 30, 2023 •
edited
Loading