Repository navigation
Revert recent changes to async_drop - #165266
Merged
Merged
Conversation
Collaborator
|
This PR changes a file inside |
Contributor
|
@bors r+ rollup |
Contributor
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 1, 2026
…uwer Rollup of 6 pull requests Successful merges: - #138143 (rustdoc: add unstable option `--crate-list-heading` to customize the sidebar crate list.) - #165251 (Restore aarch64-apple-1 jobs with free disk space) - #160180 (Provide more context when an expected type was a type parameter) - #165262 (Replace `AbiAlign` with `Align` in function returns) - #165265 (Bless mir-opt tests again, again) - #165266 (Revert recent changes to async_drop)
This was referenced Nov 1, 2026
This was referenced Nov 1, 2026
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Nov 1, 2026
Revert recent changes to async_drop Reverts rust-lang#164987 Fixes rust-lang#165263 (Note that some big crates are currently broken from this on nightly) Unfixes rust-lang#142155, rust-lang#164901 (A bit of context on [zulip](https://rust-lang.zulipchat.com/#narrow/channel/245100-t-compiler.2Fprioritization.2Falerts/topic/.23165263.20Regression.3A.20.22cycle.20detected.20when.20computing.20when.20.60T.60.E2.80.A6/with/636612201)) Also added a regression test. r? oli-obk (reviewer of the reverted PR) If you think there is a way to fix this in a timely manner without reverting the entire PR, feel free to close.
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 1, 2026
Rollup merge of #165266 - maxdexh:issue-165263, r=oli-obk Revert recent changes to async_drop Reverts #164987 Fixes #165263 (Note that some big crates are currently broken from this on nightly) Unfixes #142155, #164901 (A bit of context on [zulip](https://rust-lang.zulipchat.com/#narrow/channel/245100-t-compiler.2Fprioritization.2Falerts/topic/.23165263.20Regression.3A.20.22cycle.20detected.20when.20computing.20when.20.60T.60.E2.80.A6/with/636612201)) Also added a regression test. r? oli-obk (reviewer of the reverted PR) If you think there is a way to fix this in a timely manner without reverting the entire PR, feel free to close.
12 of 18 tasks
This was referenced Nov 3, 2026
DaniPopes
pushed a commit
to DaniPopes/rustc_codegen_cranelift
that referenced
this pull request
Nov 4, 2026
…uwer Rollup of 6 pull requests Successful merges: - rust-lang/rust#138143 (rustdoc: add unstable option `--crate-list-heading` to customize the sidebar crate list.) - rust-lang/rust#165251 (Restore aarch64-apple-1 jobs with free disk space) - rust-lang/rust#160180 (Provide more context when an expected type was a type parameter) - rust-lang/rust#165262 (Replace `AbiAlign` with `Align` in function returns) - rust-lang/rust#165265 (Bless mir-opt tests again, again) - rust-lang/rust#165266 (Revert recent changes to async_drop)
coleleavitt
added a commit
to coleleavitt/rust
that referenced
this pull request
Nov 14, 2026
Fixes rust-lang#142155. The ForLint arm of build_scope_drops does not advance dropline_to. diverge_dropline_target adds a coroutine drop-tree node for every scheduled drop (Value, Storage, ForLint), but only Value and Storage step the cursor. When tail_expr_drop_order is enabled (-W rust-2024-compatibility, cargo fix --edition) and the scope has an async-drop value, the cursor lags one node and the Storage arm's debug_assert_eq fires. The fix adds the same 4-line if-let block the Storage arm has. rust-lang#164987 attempted a fix in needs_async_drop; it was reverted in rust-lang#165266. This fix is in a different place (scope.rs, the drop-tree walk). LLM disclosure: I wrote and tested this fix myself. An LLM reviewed the control-flow graph and MIR output.
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Nov 17, 2026
Fix ICE in tail_expr_drop_order lint with async drops fixes rust-lang#142155. `ForLint` arm of `build_scope_drops` doesnt advance `dropline_to`. `diverge_dropline_target` adds a coroutine drop-tree node for every scheduled drop (Value, Storage, ForLint) but only Value and Storage step the cursor. when `tail_expr_drop_order` is enabled (`-W rust-2024-compatibility`, `cargo fix --edition`) and the scope has an async-drop value the cursor lags one node and the Storage arm's `debug_assert_eq!` fires. The fix adds the same 4-line if-let block the Storage arm has. rust-lang#164987 attempted a fix in `needs_async_drop` which was reverted in rust-lang#165266.
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 17, 2026
Rollup merge of #166003 - coleleavitt:main, r=cjgillot Fix ICE in tail_expr_drop_order lint with async drops fixes #142155. `ForLint` arm of `build_scope_drops` doesnt advance `dropline_to`. `diverge_dropline_target` adds a coroutine drop-tree node for every scheduled drop (Value, Storage, ForLint) but only Value and Storage step the cursor. when `tail_expr_drop_order` is enabled (`-W rust-2024-compatibility`, `cargo fix --edition`) and the scope has an async-drop value the cursor lags one node and the Storage arm's `debug_assert_eq!` fires. The fix adds the same 4-line if-let block the Storage arm has. #164987 attempted a fix in `needs_async_drop` which was reverted in #165266.
github-actions Bot
pushed a commit
to rust-lang/stdarch
that referenced
this pull request
Nov 19, 2026
Fix ICE in tail_expr_drop_order lint with async drops fixes rust-lang/rust#142155. `ForLint` arm of `build_scope_drops` doesnt advance `dropline_to`. `diverge_dropline_target` adds a coroutine drop-tree node for every scheduled drop (Value, Storage, ForLint) but only Value and Storage step the cursor. when `tail_expr_drop_order` is enabled (`-W rust-2024-compatibility`, `cargo fix --edition`) and the scope has an async-drop value the cursor lags one node and the Storage arm's `debug_assert_eq!` fires. The fix adds the same 4-line if-let block the Storage arm has. rust-lang/rust#164987 attempted a fix in `needs_async_drop` which was reverted in rust-lang/rust#165266.
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
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.
Reverts #164987
Fixes #165263 (Note that some big crates are currently broken from this on nightly)
Unfixes #142155, #164901
(A bit of context on zulip)
Also added a regression test.
r? oli-obk (reviewer of the reverted PR)
If you think there is a way to fix this in a timely manner without reverting the entire PR, feel free to close.