Skip to content

[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks - #33552

Merged
bors merged 1 commit into
rust-lang:masterfrom
dotdash:scfg
May 14, 2016
Merged

[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks#33552
bors merged 1 commit into
rust-lang:masterfrom
dotdash:scfg

Conversation

@dotdash

@dotdashdotdash commented May 11, 2016

Copy link
Copy Markdown
Contributor

Updated from #30238, including the changes suggested by @Aatch.

@rust-highfive

rust-highfive commented May 11, 2016

Copy link
Copy Markdown
Contributor

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

@bors

bors commented May 11, 2016

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #33425) made this pull request unmergeable. Please resolve the merge conflicts.

luqmana
luqmana reviewed May 11, 2016
View reviewed changes
Comment threadsrc/librustc_mir/transform/simplify_cfg.rs Outdated

@luqmanaluqmanaMay 11, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I think the below here became above. Could just say in the function merge_consecutive_blocks instead.

@luqmana

luqmana commented May 11, 2016•
edited
Loading

Copy link
Copy Markdown
Contributor

LGTM! 👍

r=me on rebase

nagisa
nagisa reviewed May 11, 2016
View reviewed changes
Comment threadsrc/librustc_mir/transform/predecessor_map.rs Outdated

@nagisanagisaMay 11, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: to me it seems like it ought to be a PredecessorMap::from_mir or something.

@dotdash

dotdash commented May 11, 2016•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Rebased and nits addressed.

@bors r=luqmana

@bors

bors commented May 11, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 1ebb07e has been approved by luqman

@bors

bors commented May 11, 2016

Copy link
Copy Markdown
Collaborator

💡 This pull request was already approved, no need to approve it again.

@bors

bors commented May 11, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 1ebb07e has been approved by luqmana

@ManishearthManishearth mentioned this pull request May 12, 2016
Closed
@eddybeddyb mentioned this pull request May 12, 2016
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request May 12, 2016
@Manishearth
Rollup merge ofrust-lang#33552- dotdash:scfg, r=luqmana
3c8aa6e
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks
Updated from rust-lang#30238, including the changes suggested by @Aatch.
@eddybeddyb mentioned this pull request May 12, 2016
Closed
eddyb added a commit to eddyb/rust that referenced this pull request May 12, 2016
@eddyb
Rollup merge ofrust-lang#33552- dotdash:scfg, r=luqmana
e40553c
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks
Updated from rust-lang#30238, including the changes suggested by @Aatch.
@eddybeddyb mentioned this pull request May 12, 2016
Closed
bors added a commit that referenced this pull request May 12, 2016
@bors
Auto merge of#33597- eddyb:rollup, r=eddyb
2c5ce8c
Rollup of 23 pull requests
- Successful merges: #33282, #33342, #33393, #33450, #33513, #33517, #33531, #33532, #33533, #33534, #33538, #33541, #33544, #33552, #33555, #33560, #33563, #33565, #33566, #33572, #33580, #33590, #33596
- Failed merges: #33578
@eddyb

eddyb commented May 13, 2016

Copy link
Copy Markdown
Contributor

@bors r=luqmana

@bors

bors commented May 13, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 8ad6d27 has been approved by luqmana

@eddybeddyb mentioned this pull request May 13, 2016
Closed
eddyb added a commit to eddyb/rust that referenced this pull request May 13, 2016
@eddyb
Rollup merge ofrust-lang#33552- dotdash:scfg, r=luqmana
494bc14
[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
@Manishearth
Rollup merge ofrust-lang#33552- dotdash:scfg, r=luqmana
ea68dd8
[MIR] Enhance the SimplifyCfg pass to merge consecutive blocks
Updated from rust-lang#30238, including the changes suggested by @Aatch.
@ManishearthManishearth mentioned this pull request May 14, 2016
Merged
bors added a commit that referenced this pull request May 14, 2016
@bors
Auto merge of#33632- Manishearth:rollup, r=Manishearth
6ba8a1a
Rollup of 9 pull requests
- Successful merges: #33544, #33552, #33554, #33555, #33560, #33566, #33572, #33574, #33576
- Failed merges:
@bors
bors merged commit 8ad6d27 into rust-lang:masterMay 14, 2016
@dotdash
dotdash deleted the scfg branch May 17, 2016 03:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@arielb1arielb1

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@dotdash@rust-highfive@bors@luqmana@eddyb@nagisa@arielb1