-
-
Notifications
You must be signed in to change notification settings - Fork 31.8k
GH-90997: Wrap yield from
/await
in a virtual try
/except StopIteration
#96010
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.
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
Conversation
Lib/test/test_dis.py
Outdated
1: c | ||
0: value | ||
1: b | ||
2: c | ||
Variable names: | ||
0: a | ||
1: d""" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be good to also add a test that shows what you're fixing here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, we're not really fixing anything (in fact, we want the behavior to stay exactly the same). All we're really doing is moving some of the error handling logic for close
and throw
into the bytecode, so I'm not really sure how to test that.
I'm confident that the tests in test_yield_from.TestInterestingEdgeCases
exercise this path enough to prevent any behavior changes (like we've seen with other approaches to address this issue).
This adds a lot of bulk to the bytecode. async def foo(x):
await x main
this PR
What I had envisioned
Where Much like See also faster-cpython/ideas#448 |
Yeah, like I said in the meetings: this about triples the size of the bytecode (all in the cold path, though). If all we care about here is the literal size of the bytecode, then we can pack everything in the exception handler into its own dedicated instruction. This would look a lot like
I've been trying to get something like this to work for the last few weeks in between release blocker firefighting and vacations, but I've just been left convinced that there are too many wrinkles to make it this elegant. Even setting aside the relatively minor annoyance that we need two
For reference, here is my mostly-but-not-quite working Add to all this that I'm very confident that this PR behaves correctly, and I understand it very well, but am very far from being able to promise that a |
Also note that for many compiler-generated |
Sure, there are many complications around what is thrown, or whether close is called, etc. With this new function: PySendResult
_Py_throw_into(PyGenObject *subgen, int close_on_genexit, PyObject *typ, PyObject *val, PyObject *tb, PyObject **presult); We can initially refactor static PyObject *
_gen_throw(PyGenObject *gen, int close_on_genexit,
PyObject *typ, PyObject *val, PyObject *tb)
{
PyObject *yf = _PyGen_yf(gen);
if (yf) {
PyObect *res;
PySendResult what = _Py_throw_into(yf, close_on_genexit, type, val, tb, &res);
switch(what) {
case PYGEN_RETURN:
/* Stop SEND loop */
/* Awkward popping and jumping goes here */
return gen_send(gen, val);
case PYGEN_ERROR:
return NULL;
case PYGEN_NEXT:
return res;
}
}
throw_here:
... That doesn't help much by itself, but Instead of generating
we generate
|
See also #96040 |
Closing and reopening to re-run the Azure Pipelines failure. |
@markshannon, I've updated the PR based on our discussion this morning. Let me know how it looks. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a definite improvement over the current implementation.
Ultimately we want all the handling of sub-generators to done in bytecode.
This is a good first step, moving the flow control into the bytecode.
Doc/library/dis.rst
Outdated
@@ -567,6 +567,17 @@ the original TOS1. | |||
.. versionchanged:: 3.11 | |||
Exception representation on the stack now consist of one, not three, items. | |||
|
|||
|
|||
.. opcode:: END_THROW |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
END
suggests that this is the end of a sequence of bytecodes.
Maybe CLEANUP_THROW
as it cleans up _gen_throw
?
Python/compile.c
Outdated
// Set up a virtual try/except to handle when StopIteration is raised during | ||
// a close or throw call. The only way YIELD_VALUE raises if they do! | ||
ADDOP_JUMP(c, SETUP_FINALLY, fail); | ||
RETURN_IF_FALSE(compiler_push_fblock(c, TRY_EXCEPT, send, NO_LABEL, NULL)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There can be no call to compiler_unwind_fblock
before this block is popped, so we don't need to push a block here.
Python/compile.c
Outdated
ADDOP_I(c, YIELD_VALUE, 0); | ||
compiler_pop_fblock(c, TRY_EXCEPT, send); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nor pop it here
When you're done making the requested changes, leave the comment: |
Yeah, this fixes the main issue we were concerned with, but I agree that it makes sense to keep trying to port over more of the |
With this PR, async functions with exactly 20 nested blocks started crashing with an
see #116767 |
Supersedes #31968 by setting up a virtual
try
/except StopIteration
to handle the case where a delegated sub-generator returns a value during aclose
orthrow
call through a suspended frame. This moves the logic out of the generatorthrow
implementation and into the bytecode, which requires fewer frame hacks.It does, however, require replacingLOAD_ASSERTION_ERROR
with a more generalLOAD_EXCEPTION_TYPE
opcode that can also handleStopIteration
.It also updates the docs for
SEND
, which are incomplete.