Clarity improvements to DropTree by Zalathar · Pull Request #122080 · rust-lang/rust (original) (raw)
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 andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation5 Commits4 Checks0 Files changed
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
[ Show hidden characters]({{ revealButtonHref }})
These changes are based on some points of confusion I had when initially trying to understand this code.
The only “functional” change is an additional assertion in <ExitScopes as DropTreeBuilder>::link_entry_point, checking that the dummy terminator is TerminatorKind::UnwindResume as expected.
This clarifies that we're adding an "entry point", not just adding an "entry" of some kind.
This allows us to use real field names instead of tuple element numbers.
Renaming previous_drops to existing_drops_map clarifies that "previous" was
unrelated to drop order.
r? @fmease
rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r? to explicitly pick a reviewer
Status: Awaiting review from the assignee but also interested parties.
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Originally I had added a debug_assert!, but looking at the other implementations I noticed that they both have some kind of span_bug! assertion anyway, so adding one to the ExitScopes impl seems unobtrusive.
Thanks! Generally makes sense but I don't feel comfortable approving this as I'm not super familiar with MIR (yet).
r? @oli-obk
📌 Commit 5ba70bd has been approved by oli-obk
It is now in the queue for this repository.
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
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request
Clarity improvements to DropTree
These changes are based on some points of confusion I had when initially trying to understand this code.
The only “functional” change is an additional assertion in <ExitScopes as DropTreeBuilder>::link_entry_point, checking that the dummy terminator is TerminatorKind::UnwindResume as expected.
bors added a commit to rust-lang-ci/rust that referenced this pull request
…kingjubilee
Rollup of 15 pull requests
Successful merges:
- rust-lang#116791 (Allow codegen backends to opt-out of parallel codegen)
- rust-lang#116793 (Allow targets to override default codegen backend)
- rust-lang#117458 (LLVM Bitcode Linker: A self contained linker for nvptx and other targets)
- rust-lang#119385 (Fix type resolution of associated const equality bounds (take 2))
- rust-lang#121438 (std support for wasm32 panic=unwind)
- rust-lang#121893 (Add tests (and a bit of cleanup) for interior mut handling in promotion and const-checking)
- rust-lang#122080 (Clarity improvements to
DropTree) - rust-lang#122152 (Improve diagnostics for parenthesized type arguments)
- rust-lang#122166 (Remove the unused
field_remappingfield fromTypeLowering) - rust-lang#122249 (interpret: do not call machine read hooks during validation)
- rust-lang#122299 (Store backtrace for
must_produce_diag) - rust-lang#122318 (Revision-related tweaks for next-solver tests)
- rust-lang#122320 (Use ptradd for vtable indexing)
- rust-lang#122328 (unix_sigpipe: Replace
inheritwithsig_dflin syntax tests) - rust-lang#122330 (bootstrap readme: fix, improve, update)
r? @ghost
@rustbot modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#122080 - Zalathar:drop-tree, r=oli-obk
Clarity improvements to DropTree
These changes are based on some points of confusion I had when initially trying to understand this code.
The only “functional” change is an additional assertion in <ExitScopes as DropTreeBuilder>::link_entry_point, checking that the dummy terminator is TerminatorKind::UnwindResume as expected.
Labels
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the compiler team, which will review and decide on the PR/issue.