Make UnwindAction::Continue explicit in MIR dump
#112972
Merged
Conversation
This file contains 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? @davidtwco (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
| @@ -272,7 +272,8 @@ impl<'tcx> Debug for TerminatorKind<'tcx> { | |||
|
|
|||
| let unwind = match self.unwind() { | |||
| // Not needed or included in successors | |||
| None | Some(UnwindAction::Continue) | Some(UnwindAction::Cleanup(_)) => None, | |||
| None | Some(UnwindAction::Cleanup(_)) => None, | |||
There was a problem hiding this comment.
Hm, why aren't we also making Cleanup explicit?
There was a problem hiding this comment.
They are already printed as successors
There was a problem hiding this comment.
Cleanup is the only unwind action that includes a basic block #
davidtwco
approved these changes
Jun 27, 2023
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 27, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#112207 (Add trustzone and virtualization target features for aarch32.) - rust-lang#112454 (Make compiletest aware of targets without dynamic linking) - rust-lang#112628 (Allow comparing `Box`es with different allocators) - rust-lang#112692 (Provide more context for `rustc +nightly -Zunstable-options` on stable) - rust-lang#112972 (Make `UnwindAction::Continue` explicit in MIR dump) - rust-lang#113020 (Add tests impl via obj unless denied) - rust-lang#113084 (Simplify some conditions) - rust-lang#113103 (Normalize types when applying uninhabited predicate.) r? `@ghost` `@rustbot` modify labels: rollup
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.
Makes it easier to spot unwinding related issues in MIR by making
UnwindAction::Continueexplicit, just like all otherUnwindActions.