Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Simplify MIR generation for logical ops" #63431

Merged
merged 1 commit into from
Aug 12, 2019

Conversation

andjo403
Copy link
Contributor

This reverts commit e38e954.

llvm were not able to optimize the code that well with the simplified mir.

Closes: #62993

This reverts commit e38e954.

llvm were not able to optimize the code that well with the simplified mir.

Closes: rust-lang#62993
@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 10, 2019
@eddyb
Copy link
Member

eddyb commented Aug 10, 2019

r? @matthewjasper cc @nagisa

@rust-highfive rust-highfive assigned matthewjasper and unassigned eddyb Aug 10, 2019
@Centril
Copy link
Contributor

Centril commented Aug 10, 2019

@bors try

@bors
Copy link
Contributor

bors commented Aug 10, 2019

⌛ Trying commit 676953f with merge 8d93eae...

bors added a commit that referenced this pull request Aug 10, 2019
Revert "Simplify MIR generation for logical ops"

This reverts commit e38e954.

llvm were not able to optimize the code that well with the simplified mir.

Closes: #62993
@bors
Copy link
Contributor

bors commented Aug 10, 2019

☀️ Try build successful - checks-azure
Build commit: 8d93eae

@Centril
Copy link
Contributor

Centril commented Aug 10, 2019

@rust-timer build 8d93eae

@rust-timer
Copy link
Collaborator

Success: Queued 8d93eae with parent be8bbb0, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 8d93eae, comparison URL.

@matthewjasper
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 11, 2019

📌 Commit 676953f has been approved by matthewjasper

@bors bors added S-waiting-on-bors 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 Aug 11, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
… r=matthewjasper

Revert "Simplify MIR generation for logical ops"

This reverts commit e38e954.

llvm were not able to optimize the code that well with the simplified mir.

Closes: rust-lang#62993
bors added a commit that referenced this pull request Aug 12, 2019
Rollup of 10 pull requests

Successful merges:

 - #62108 (Use sharded maps for queries)
 - #63297 (Improve pointer offset method docs)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63406 (Suggest using a qualified path in patterns with inconsistent bindings)
 - #63431 (Revert "Simplify MIR generation for logical ops")
 - #63449 (resolve: Remove remaining special cases from built-in macros)
 - #63461 (docs: add stdlib env::var(_os) panic)
 - #63473 (Regression test for #56870)
 - #63474 (Add tests for issue #53598 and #57700)
 - #63480 (Fixes #63477)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
… r=matthewjasper

Revert "Simplify MIR generation for logical ops"

This reverts commit e38e954.

llvm were not able to optimize the code that well with the simplified mir.

Closes: rust-lang#62993
bors added a commit that referenced this pull request Aug 12, 2019
Rollup of 9 pull requests

Successful merges:

 - #62108 (Use sharded maps for queries)
 - #63297 (Improve pointer offset method docs)
 - #63406 (Suggest using a qualified path in patterns with inconsistent bindings)
 - #63431 (Revert "Simplify MIR generation for logical ops")
 - #63449 (resolve: Remove remaining special cases from built-in macros)
 - #63461 (docs: add stdlib env::var(_os) panic)
 - #63473 (Regression test for #56870)
 - #63474 (Add tests for issue #53598 and #57700)
 - #63480 (Fixes #63477)

Failed merges:

r? @ghost
@bors bors merged commit 676953f into rust-lang:master Aug 12, 2019
@tesuji
Copy link
Contributor

tesuji commented Aug 12, 2019

Should we have a regression test for #62993 ?

@andjo403 andjo403 deleted the revert_mir_simplification branch August 13, 2019 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Boolean optimization no longer works
8 participants