Allow StorageDead(s) of the target block could be copied to the branching block #93987
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
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @matthewjasper (or someone else) soon. Please see the contribution instructions for more information. |
rustbot
added
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
bjorn3
reviewed
Feb 15, 2022
| if !bridge_bb_statement.is_empty() { | ||
| let storagedeads = bridge_bb_statement.clone(); | ||
| body.basic_blocks_mut()[opt.bb_with_goto].statements.extend(storagedeads); | ||
| debug!("SUCCESS: extending terminator's basic block with briding basic block."); |
There was a problem hiding this comment.
Suggested change
| debug!("SUCCESS: extending terminator's basic block with briding basic block."); | |
| debug!("SUCCESS: extending terminator's basic block with bridging basic block."); |
cjgillot
reviewed
Feb 19, 2022
src/test/mir-opt/matches_reduce_branches.match_nested_if.MatchBranchSimplification.64bit.diff
Show resolved
Hide resolved
|
cc @simonvandel |
simonvandel
reviewed
Feb 19, 2022
Comment on lines
+47
to
+50
| let bridge_bb_statement = &body.basic_blocks()[opt.bridge_bb].statements; | ||
| if !bridge_bb_statement.is_empty() { | ||
| let storagedeads = bridge_bb_statement.clone(); | ||
| body.basic_blocks_mut()[opt.bb_with_goto].statements.extend(storagedeads); |
There was a problem hiding this comment.
Suggested change
| let bridge_bb_statement = &body.basic_blocks()[opt.bridge_bb].statements; | |
| if !bridge_bb_statement.is_empty() { | |
| let storagedeads = bridge_bb_statement.clone(); | |
| body.basic_blocks_mut()[opt.bb_with_goto].statements.extend(storagedeads); | |
| let bridge_bb_statements = &body.basic_blocks()[opt.bridge_bb].statements; | |
| if !bridge_bb_statements.is_empty() { | |
| let storagedeads = bridge_bb_statements.into_iter().cloned(); | |
| body.basic_blocks_mut()[opt.bb_with_goto].statements.extend(storagedeads); |
cjgillot
reviewed
Feb 23, 2022
cjgillot
reviewed
Mar 9, 2022
| @@ -11,6 +11,24 @@ pub enum Foo { | |||
| fn issue_77355_opt(num: Foo) -> u64 { | |||
| if matches!(num, Foo::B | Foo::C) { 23 } else { 42 } | |||
| } | |||
|
|
|||
| // EMIT_MIR const_goto.match_nested_if.MatchBranchSimplification.diff | |||
There was a problem hiding this comment.
Suggested change
| // EMIT_MIR const_goto.match_nested_if.MatchBranchSimplification.diff | |
| // EMIT_MIR const_goto.match_nested_if.MatchBranchSimplification.diff | |
| // EMIT_MIR const_goto.match_nested_if.ConstGoto.diff |
|
Hi @yzwqf. Could you please address unresolved comments? |
cjgillot
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #95723) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Ping from triage: |
rustbot
added
the
S-inactive
|
@rustbot claim |
|
Assignment is not allowed on a closed PR. |
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.
Just like 'FIXME(simonvandel)' says. However, intellegient mechanism is need if we care about code size.