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.

Sign up for GitHub

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

Jump to bottom

SimplifyArmIdentity only for locals with the same type #66870

Merged
merged 1 commit into from
Dec 1, 2019
Merged

SimplifyArmIdentity only for locals with the same type #66870

merged 1 commit into from
Dec 1, 2019

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Nov 29, 2019 •
edited by Centril
Loading

Fixes #66856
Fixes #66851

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @davidtwco (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 29, 2019
@tmiasko
Copy link
Contributor Author

tmiasko commented Nov 29, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned davidtwco Nov 29, 2019
Centril
Centril reviewed Nov 29, 2019
View reviewed changes
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

Looks like you beat me to it... ;)
I had some additional stuff that would be good to add.

src/librustc_mir/transform/simplify_try.rs Show resolved Hide resolved
src/librustc_mir/transform/simplify_try.rs Show resolved Hide resolved
src/librustc_mir/transform/simplify_try.rs Show resolved Hide resolved
src/test/ui/issues/issue-66851.rs Show resolved Hide resolved
src/test/ui/issues/issue-66856.rs Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Nov 29, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned Centril Nov 29, 2019
@tmiasko @Centril
SimplifyArmIdentity only for locals with the same type
45c4e11 
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
@oli-obk
Copy link
Contributor

oli-obk commented Nov 29, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Nov 29, 2019

📌 Commit 45c4e11 has been approved by oli-obk

@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 Nov 29, 2019
@bors
Copy link
Contributor

bors commented Nov 30, 2019

⌛ Testing commit 45c4e11 with merge f6c902286ac4d2599508c5e302d4317ff03cf760...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-11-30T02:00:08.4647697Z SYSTEM_TEAMPROJECTID=e71b0ddf-dd27-435a-873c-e30f86eea377
2019-11-30T02:00:08.4647787Z SYSTEM_TIMELINEID=85c16726-9ec1-40e1-8c81-4ac0c89521c1
2019-11-30T02:00:08.4647850Z SYSTEM_TOTALJOBSINPHASE=16
2019-11-30T02:00:08.4647923Z SYSTEM_WORKFOLDER=D:\a
2019-11-30T02:00:08.4647996Z SimplifyArmIdentity only for locals with the same type
2019-11-30T02:00:08.4648139Z TEMP=/tmp
2019-11-30T02:00:08.4648205Z TERM=cygwin
2019-11-30T02:00:08.4648272Z TF_BUILD=True
2019-11-30T02:00:08.4648324Z TMP=/tmp
---
2019-11-30T02:01:11.8461215Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-11-30T02:01:11.8461429Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-11-30T02:01:11.8465784Z 
2019-11-30T02:01:11.8470103Z Failures
2019-11-30T02:01:11.8480444Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-11-30T02:01:11.8480775Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-11-30T02:01:12.3410350Z 
2019-11-30T02:01:12.3493201Z ##[error]Bash exited with code '1'.
2019-11-30T02:01:12.3684397Z ##[section]Starting: Checkout
2019-11-30T02:01:12.3836234Z ==============================================================================
2019-11-30T02:01:12.3836348Z Task         : Get sources
2019-11-30T02:01:12.3836462Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 30, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 30, 2019
@Centril
Copy link
Contributor

Centril commented Nov 30, 2019

@bors retry spurious

@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 Nov 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Nov 30, 2019
@Centril
Rollup merge of rust-lang#66870 - tmiasko:simplify-ty, r=oli-obk
472bee2 
SimplifyArmIdentity only for locals with the same type

Fixes rust-lang#66856
Fixes rust-lang#66851
@Centril Centril mentioned this pull request Nov 30, 2019
Merged
bors added a commit that referenced this pull request Dec 1, 2019
@bors
Auto merge of #66908 - Centril:rollup-26givp6, r=Centril
135ccba 
Rollup of 9 pull requests

Successful merges:

 - #66612 (Initial implementation of or-pattern usefulness checking)
 - #66705 (Atomic as_mut_ptr)
 - #66759 (impl TrustedLen for vec::Drain)
 - #66858 (Use LLVMAddAnalysisPasses instead of Rust's wrapper)
 - #66870 (SimplifyArmIdentity only for locals with the same type)
 - #66883 (rustc_typeck: gate AnonConst's generics on feature(const_generics).)
 - #66889 (Make python-generated source files compatible with rustfmt)
 - #66894 (Remove unneeded prelude imports in libcore tests)
 - #66895 (Feature gating *declarations* => new crate `rustc_feature`)

Failed merges:

 - #66905 (rustc_plugin: Remove some remaining plugin features)

r? @ghost
@bors bors merged commit 45c4e11 into rust-lang:master Dec 1, 2019
@oli-obk oli-obk mentioned this pull request Dec 1, 2019
Closed
@tmiasko tmiasko deleted the simplify-ty branch March 1, 2020 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ICE with mir-opt-level=2: store_with_flags: invalid ScalarPair layout Miscompilation with recent Nightlies
6 participants
@tmiasko @rust-highfive @Centril @oli-obk @bors @davidtwco