[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks #33552
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? @arielb1 (rust_highfive has picked a reviewer for you, use r? to override) |
|
☔ The latest upstream changes (presumably #33425) made this pull request unmergeable. Please resolve the merge conflicts. |
|
|
||
| while mir.basic_block_data(target).statements.is_empty() { | ||
| // NB -- terminator may have been swapped with `None` | ||
| // below, in which case we have a cycle and just want |
There was a problem hiding this comment.
Nit: I think the below here became above. Could just say in the function merge_consecutive_blocks instead.
|
LGTM! 👍 r=me on rebase |
| } | ||
| } | ||
|
|
||
| pub fn build_predecessor_map(mir: &Mir) -> PredecessorMap { |
There was a problem hiding this comment.
NIT: to me it seems like it ought to be a PredecessorMap::from_mir or something.
|
Rebased and nits addressed. @bors r=luqmana |
|
📌 Commit 1ebb07e has been approved by |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit 1ebb07e has been approved by |
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 12, 2016
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks Updated from rust-lang#30238, including the changes suggested by @Aatch.
eddyb
added a commit
to eddyb/rust
that referenced
this pull request
May 12, 2016
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks Updated from rust-lang#30238, including the changes suggested by @Aatch.
|
@bors r=luqmana |
|
📌 Commit 8ad6d27 has been approved by |
eddyb
added a commit
to eddyb/rust
that referenced
this pull request
May 13, 2016
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks Updated from rust-lang#30238, including the changes suggested by @Aatch.
Manishearth
added a commit
to Manishearth/rust
that referenced
this pull request
May 14, 2016
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks Updated from rust-lang#30238, including the changes suggested by @Aatch.
bors
added a commit
that referenced
this pull request
May 14, 2016
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.
Updated from #30238, including the changes suggested by @Aatch.