Skip to content

Drop tracking: track borrows of projections #93751

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Feb 9, 2022

Conversation

eholk
Copy link
Contributor

@eholk eholk commented Feb 8, 2022

Previous efforts to ignore partially consumed values meant we were also not considering borrows of a projection. This led to cases where we'd miss borrowed types which MIR expected to be there, leading to ICEs.

This PR also includes the -Zdrop-tracking flag from #93313. If that PR lands first, I'll rebase to drop the commit from this one.

Fixes #93648

tmiasko and others added 2 commits February 7, 2022 12:27
Previous efforts to ignore partially consumed values meant we were also
not considering borrows of a projection. This led to cases where we'd
miss borrowed types which MIR expected to be there, leading to ICEs.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 8, 2022
@rust-highfive
Copy link
Contributor

r? @michaelwoerister

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 8, 2022
@eholk
Copy link
Contributor Author

eholk commented Feb 8, 2022

r? @tmiasko

@tmiasko
Copy link
Contributor

tmiasko commented Feb 8, 2022

Thanks!

Drop tracking remains disabled by default, so this should be fine to include in a rollup.

@bors r+ rollup=always

@bors
Copy link
Collaborator

bors commented Feb 8, 2022

📌 Commit 97b24f3 has been approved by tmiasko

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 8, 2022
@lqd
Copy link
Member

lqd commented Feb 8, 2022

let's wait a bit for a review on #93313 first before landing it with this PR, so a temporary @bors r-

once the other lands, feel free to r=tmiasko here thanks to: @bors delegate+

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 8, 2022
@bors
Copy link
Collaborator

bors commented Feb 8, 2022

✌️ @eholk can now approve this pull request

@tmiasko
Copy link
Contributor

tmiasko commented Feb 8, 2022

let's wait a bit for a review on #93313 first before landing it with this PR

The only commit from #93313 included here is the one adding the drop tracking flag, which is necessary for testing purposes. I don't think it requires an additional review, especially that the general direction has been discussed on the latest wg-async triage meeting.

@lqd
Copy link
Member

lqd commented Feb 8, 2022

Ok, this was not clear to me with the different PRs in-flight including parts of #93313. Then let's land this one first and rebase yours when it lands.

@bors r=tmiasko

@bors
Copy link
Collaborator

bors commented Feb 8, 2022

📌 Commit 97b24f3 has been approved by tmiasko

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 8, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#93445 (Add From<u8> for ExitCode)
 - rust-lang#93694 (rustdoc: tweak line spacing and paragraph spacing for accessibility)
 - rust-lang#93735 (Stabilize int_abs_diff in 1.60.0.)
 - rust-lang#93746 (Remove defaultness from ImplItem.)
 - rust-lang#93748 (rustc_query_impl: reduce visibility of some modules/fn's)
 - rust-lang#93751 (Drop tracking: track borrows of projections)
 - rust-lang#93781 (update `ty::TyKind` documentation)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a07eed9 into rust-lang:master Feb 9, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 9, 2022
@eholk eholk deleted the issue-93648-drop-tracking-projection branch February 9, 2022 16:33
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Drop tracking ignores borrows with projections
7 participants