-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Don't drop types with no drop glue when building drops for tailcalls #135976
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
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
this is required as otherwise drops of `&mut` refs count as a usage of a 'two-phase temporary' causing an ICE.
15 tasks
This comment has been minimized.
This comment has been minimized.
oli-obk
reviewed
Jan 24, 2025
oli-obk
approved these changes
Jan 24, 2025
r=me with crash test removed and comment updated |
f0d9dd7
to
83339bf
Compare
This comment has been minimized.
This comment has been minimized.
I'm not sure why the span improved but that's nice!
The Miri subtree was changed cc @rust-lang/miri |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 24, 2025
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#135415 (Add `File already exists` error doc to `hard_link` function) - rust-lang#135581 (Separate Builder methods from tcx) - rust-lang#135728 (document order of items in iterator from drain) - rust-lang#135749 (Do not assume const params are printed after type params) - rust-lang#135829 (Rustc dev guide subtree update) - rust-lang#135938 (Add memory layout documentation to generic NonZero<T>) - rust-lang#135949 (Use short type string in E0308 secondary span label) - rust-lang#135976 (Don't drop types with no drop glue when building drops for tailcalls) - rust-lang#135998 ([rustdoc] Fix indent of trait items on mobile) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 25, 2025
Rollup merge of rust-lang#135976 - WaffleLapkin:tailcall-nodrop, r=oli-obk Don't drop types with no drop glue when building drops for tailcalls this is required as otherwise drops of `&mut` refs count as a usage of a 'two-phase temporary' causing an ICE. fixes rust-lang#128097 The underlying issue is that the current code generates drops for `&mut` which are later counted as a second use of a two-phase temporary: `bat t.rs -p` ```rust #![expect(incomplete_features)] #![feature(explicit_tail_calls)] fn f(x: &mut ()) { let _y = String::new(); become f(x); } fn main() {} ``` `rustc t.rs -Zdump_mir=f` ```text error: internal compiler error: compiler/rustc_borrowck/src/borrow_set.rs:298:17: found two uses for 2-phase borrow temporary _4: bb2[1] and bb3[0] --> t.rs:6:5 | 6 | become f(x); | ^^^^^^^^^^^ thread 'rustc' panicked at compiler/rustc_borrowck/src/borrow_set.rs:298:17: Box<dyn Any> stack backtrace: [REDACTED] error: aborting due to 1 previous error ``` `bat ./mir_dump/t.f.-------.renumber.0.mir -p -lrust` ```rust // MIR for `f` 0 renumber fn f(_1: &mut ()) -> () { debug x => _1; let mut _0: (); let mut _2: !; let _3: std::string::String; let mut _4: &mut (); scope 1 { debug _y => _3; } bb0: { StorageLive(_3); _3 = String::new() -> [return: bb1, unwind: bb4]; } bb1: { FakeRead(ForLet(None), _3); StorageLive(_4); _4 = &mut (*_1); drop(_3) -> [return: bb2, unwind: bb3]; } bb2: { StorageDead(_3); tailcall f(Spanned { node: move _4, span: t.rs:6:14: 6:15 (#0) }); } bb3 (cleanup): { drop(_4) -> [return: bb4, unwind terminate(cleanup)]; } bb4 (cleanup): { resume; } } ``` Note how `_4 is moved into the tail call in `bb2` and dropped in `bb3`. This PR adds a check that the locals we drop need dropping. r? `@oli-obk` (feel free to reassign, I'm not sure who would be a good reviewer, but thought you might have an idea) cc `@beepster4096,` since you wrote the original drop implementation.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-destructors
Area: Destructors (`Drop`, …)
F-explicit_tail_calls
`#![feature(explicit_tail_calls)]`
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
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.
this is required as otherwise drops of
&mut
refs count as a usage of a'two-phase temporary' causing an ICE.
fixes #128097
The underlying issue is that the current code generates drops for
&mut
which are later counted as a second use of a two-phase temporary:bat t.rs -p
rustc t.rs -Zdump_mir=f
bat ./mir_dump/t.f.-------.renumber.0.mir -p -lrust
Note how
_4 is moved into the tail call in
bb2and dropped in
bb3`.This PR adds a check that the locals we drop need dropping.
r? @oli-obk (feel free to reassign, I'm not sure who would be a good reviewer, but thought you might have an idea)
cc @beepster4096, since you wrote the original drop implementation.