Fix for async drop inside async gen fn #141932
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
rustbot
added
S-waiting-on-review
|
r? oli-obk |
This comment has been minimized.
This comment has been minimized.
azhogin
force-pushed
the
azhogin/async-drop-inside-asyncgen-fix
branch
from
8e0c3d0 to
8e20c56
Compare
oli-obk
reviewed
Jun 3, 2025
Comment on lines
327
to
328
| // yield (const false) is used for async drop yields inside AsyncGen | ||
| // We need to convert value to Poll<OptRet>::Pending |
There was a problem hiding this comment.
Can we directly generate the right yield in the async drop logic?
There was a problem hiding this comment.
TerminatorKind::Yield value is Operand, but we need Rvalue::Aggregate (make_aggregate_adt).
As far as I understand, we can do Operand with an additional local variable.
So, instead of 'return Poll::Pending;', the generated code will be 'x = Poll::Pending; return x;'
Value for Yield is generated here:
.Does it cost additional temporary local?
There was a problem hiding this comment.
We can generate a const operand directly for a value of Poll::Pending(()), so that would not be the issue.
azhogin
force-pushed
the
azhogin/async-drop-inside-asyncgen-fix
branch
from
8e20c56 to
d5a9a00
Compare
|
Oh heh that works, nice @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jun 5, 2025
Rollup of 11 pull requests Successful merges: - #141890 (Add link to correct documentation in htmldocck.py) - #141932 (Fix for async drop inside async gen fn) - #141960 (Use non-2015 edition paths in tests that do not test for their resolution) - #141968 (Run wfcheck in one big loop instead of per module) - #141969 (Triagebot: Remove `assign.users_on_vacation`) - #141985 (Ensure query keys are printed with reduced queries) - #141999 (Visit the ident in `PreciseCapturingNonLifetimeArg`.) - #142005 (Change `tag_field` to `FieldIdx` in `Variants::Multiple`) - #142017 (Fix incorrect use of "recommend" over "recommended") - #142024 (Don't refer to 'this tail expression' in expansion.) - #142025 (Don't refer to 'local binding' in extern macro.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jun 5, 2025
Rollup merge of #141932 - azhogin:azhogin/async-drop-inside-asyncgen-fix, r=oli-obk Fix for async drop inside async gen fn Return value (for yield) is corrected for async drop inside async gen function. In CFG, when internal async drop future is polled and returned `Poll<()>::Pending`, then async gen resume function returns `Poll<(OptRet)>::Pending`. Fixes #140530
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Return value (for yield) is corrected for async drop inside async gen function.
In CFG, when internal async drop future is polled and returned
Poll<()>::Pending, then async gen resume function returnsPoll<(OptRet)>::Pending.Fixes #140530