Async drop poll shim for error dropee generates noop body #140967
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
|
r? @fee1-dead rustbot has assigned @fee1-dead. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
|
r? oli-obk |
oli-obk
reviewed
May 13, 2025
| @@ -121,9 +121,10 @@ pub(super) fn build_async_drop_shim<'tcx>( | |||
| parent_args.as_coroutine().resume_ty(), | |||
| ))); | |||
| body.phase = MirPhase::Runtime(RuntimePhase::Initial); | |||
| if !needs_async_drop { | |||
| if !needs_async_drop || matches!(drop_ty.kind(), ty::Error(_)) { | |||
There was a problem hiding this comment.
maybe use is_tainted_by_errors on drop_ty, as it may contain drop things within. E.g. I think this may still ICE on Struct<str> being used for a Struct<impl Sized> return type
oli-obk
added
S-waiting-on-author
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.
Fixes #140930.
When dropee type for async drop poll shim is
ty::Error(_), the generated poll function will be noop body. To avoid ICE inelaborate_drop.