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

commented Aug 10, 2019

This reverts commit e38e954.

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

Closes: #62993

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
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 10, 2019

r? @eddyb

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

@eddyb

This comment has been minimized.

Copy link
Member

commented Aug 10, 2019

@rust-highfive rust-highfive assigned matthewjasper and unassigned eddyb Aug 10, 2019

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 10, 2019

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 10, 2019

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

bors added a commit that referenced this pull request Aug 10, 2019
Auto merge of #63431 - andjo403:revert_mir_simplification, r=<try>
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

This comment has been minimized.

Copy link
Contributor

commented Aug 10, 2019

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

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 10, 2019

@rust-timer

This comment has been minimized.

Copy link

commented Aug 10, 2019

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

@rust-timer

This comment has been minimized.

Copy link

commented Aug 10, 2019

Finished benchmarking try commit 8d93eae, comparison URL.

@matthewjasper

This comment has been minimized.

Copy link
Contributor

commented Aug 11, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 11, 2019

📌 Commit 676953f has been approved by matthewjasper

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
Rollup merge of rust-lang#63431 - andjo403:revert_mir_simplification,…
… 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
Auto merge of #63482 - Centril:rollup-iyakgmg, r=Centril
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
Rollup merge of rust-lang#63431 - andjo403:revert_mir_simplification,…
… 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
Auto merge of #63489 - Centril:rollup-uuf6z1s, r=Centril
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

5 checks passed

homu Test successful
Details
pr Build #20190810.20 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@lzutao

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

Should we have a regression test for #62993 ?

@andjo403 andjo403 deleted the andjo403:revert_mir_simplification branch Aug 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.