Stop clearing box's drop flags early #131146
Closed
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? @wesleywiser rustbot has assigned @wesleywiser. Use |
rustbot
added
S-waiting-on-review
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
beepster4096
force-pushed
the
box_drop_flags
branch
from
73ea6ab to
6b9d6c7
Compare
wesleywiser
reviewed
Oct 11, 2024
There was a problem hiding this comment.
Could you add a "mir opt" test for elaborate drops that shows this behavior? (You can look at https://github.com/rust-lang/rust/blob/master/tests/mir-opt/elaborate_box_deref_in_debuginfo.rs for a similar kind of test)
beepster4096
force-pushed
the
box_drop_flags
branch
from
35f68b9 to
1bd8217
Compare
wesleywiser
reviewed
Nov 8, 2024
wesleywiser
added
S-waiting-on-author
|
@beepster4096 |
|
I forgot to @rustbot ready after responding to the review comments. Apologies. |
rustbot
added
S-waiting-on-review
wesleywiser
approved these changes
Jan 6, 2025
|
Thanks @beepster4096! @bors r+ |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 7, 2025
…leywiser Stop clearing box's drop flags early Ever since rust-lang#100036, drop flags have been incorrectly cleared when destructors are called. This only does anything in a very specific case involving Box, leading to the fields of the Box not being dropped when they should. This PR fixes that. Fixes rust-lang#131082
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 7, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#131146 (Stop clearing box's drop flags early) - rust-lang#133810 (remove unnecessary `eval_verify_bound`) - rust-lang#134745 (Normalize each signature input/output in `typeck_with_fallback` with its own span) - rust-lang#134989 (Lower Guard Patterns to HIR.) - rust-lang#135149 (Use a post-monomorphization typing env when mangling components that come from impls) - rust-lang#135171 (rustdoc: use stable paths as preferred canonical paths) - rust-lang#135200 (rustfmt: drop nightly-gating of the `--style-edition` flag registration) r? `@ghost` `@rustbot` modify labels: rollup
bors
added
S-waiting-on-author
|
@rustbot label A-box |
|
☔ The latest upstream changes (presumably #137030) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@beepster4096 From wg-triage, Any updates on this PR? Thanks for your contribution. |
|
@LFS6502 No updates, still just needs that rollup failure investigated and a rebase. Only blocked on my capacity to do work. No ETA on that unfortunately. |
|
Closing, in favor of a rewritten PR I'll open soon |
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jul 21, 2025
… r=oli-obk Fix Box allocator drop elaboration New version of rust-lang#131146. Clearing Box's drop flag after running its destructor can cause it to skip dropping its allocator, so just don't. Its cleared by the drop ladder code afterwards already. Unlike the last PR this also handles other types with destructors properly, in the event that we can have open drops on them in the future (by partial initialization or DerefMove or something). Finally, I also added tests for the interaction with async drop here but I discovered rust-lang#143658, so one of the tests has a `knownbug` annotation. Not sure if it should be in this PR at all though. Fixes rust-lang#131082 r? wesleywiser - prev. reviewer
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Jul 21, 2025
… r=oli-obk Fix Box allocator drop elaboration New version of rust-lang#131146. Clearing Box's drop flag after running its destructor can cause it to skip dropping its allocator, so just don't. Its cleared by the drop ladder code afterwards already. Unlike the last PR this also handles other types with destructors properly, in the event that we can have open drops on them in the future (by partial initialization or DerefMove or something). Finally, I also added tests for the interaction with async drop here but I discovered rust-lang#143658, so one of the tests has a `knownbug` annotation. Not sure if it should be in this PR at all though. Fixes rust-lang#131082 r? wesleywiser - prev. reviewer
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.
Ever since #100036, drop flags have been incorrectly cleared when destructors are called. This only does anything in a very specific case involving Box, leading to the fields of the Box not being dropped when they should. This PR fixes that.
Fixes #131082