Skip to content

[mir-opt] Disable the ConsideredEqual logic in SimplifyBranchSame opt - #76837

Merged
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:disable_consideredequal
Sep 18, 2020
Merged

[mir-opt] Disable the ConsideredEqual logic in SimplifyBranchSame opt#76837
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:disable_consideredequal

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Sep 17, 2020

Copy link
Copy Markdown
Member

The logic is currently broken and we need to disable it to fix a beta
regression (see #76803)

r? @oli-obk

@wesleywiserwesleywiser added beta-nominated Nominated for backporting to the compiler in the beta channel. A-mir-opt Area: MIR optimizations labels Sep 17, 2020
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2020
@wesleywiser
[mir-opt] Disable the ConsideredEqual logic in SimplifyBranchSame opt
dbd7226
The logic is currently broken and we need to disable it to fix a beta
regression (see rust-lang#76803)
@jonas-schievinkjonas-schievink added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 17, 2020
@oli-obk

oli-obk commented Sep 17, 2020

Copy link
Copy Markdown
Contributor

@bors r+ p=1

@bors

bors commented Sep 17, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit dbd7226 has been approved by oli-obk

@borsbors 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 Sep 17, 2020
@bors

bors commented Sep 17, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dbd7226 with merge a4b89bbf799a0e26b22994dd8fb46ac664c2678b...

@simonvandelsimonvandel mentioned this pull request Sep 17, 2020
Merged
RalfJung
RalfJung reviewed Sep 17, 2020
View reviewed changes
Comment threadcompiler/rustc_mir/src/transform/simplify_try.rs
@bors

bors commented Sep 17, 2020

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors 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 Sep 17, 2020
@rust-log-analyzer

rust-log-analyzer commented Sep 17, 2020

Copy link
Copy Markdown
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.
##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

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 @rust-lang/infra. (Feature Requests)

@wesleywiser

wesleywiser commented Sep 17, 2020

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors 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 Sep 17, 2020
@bors

bors commented Sep 18, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dbd7226 with merge 7298f74325871e387d72e4d512a1600c7104c5e3...

@bors

bors commented Sep 18, 2020

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors 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 Sep 18, 2020
@oli-obk

oli-obk commented Sep 18, 2020

Copy link
Copy Markdown
Contributor

@bors retry

@borsbors 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 Sep 18, 2020
@bors

bors commented Sep 18, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit dbd7226 with merge 2c69266...

@bors

bors commented Sep 18, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: oli-obk
Pushing 2c69266 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 18, 2020
@bors
bors merged commit 2c69266 into rust-lang:masterSep 18, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 18, 2020
@spastorino

spastorino commented Sep 24, 2020

Copy link
Copy Markdown
Member

discussed in T-compiler meeting.

@rustbot modify labels: beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 24, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 25, 2020
@bors
Auto merge ofrust-lang#76844- simonvandel:fix-76803, r=wesleywiser
9d74efe
Fixrust-lang#76803 miscompilation
Fixesrust-lang#76803
Seems like it was an oversight that the discriminant value being set was not compared to the target value from the SwitchInt, as a comment says this is a requirement for the optimization to be sound.
r? `@wesleywiser` since you are probably familiar with the optimization and made rust-lang#76837 to workaround the bug
@Mark-SimulacrumMark-Simulacrum modified the milestones: 1.48.0, 1.47.0Sep 28, 2020
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 28, 2020
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Sep 28, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2020
@bors
Auto merge ofrust-lang#77308- Mark-Simulacrum:beta-next, r=Mark-Sim…
9f0e6fa
…ulacrum
[beta] backports
This backports the following:
* revert const_type_id stabilization rust-lang#77083
* [mir-opt] Disable the `ConsideredEqual` logic in SimplifyBranchSame opt rust-lang#76837
* Rename Iterator::get_unchecked rust-lang#77201 (manually, because of file renaming and other issues on master causing literal cherry-pick to fail)
* Rebase LLVM onto 11.0.0-rc3 rust-lang#77063 (bumping direct to master, see rust-lang#77063 (comment)).
The last two have not yet been approved by compiler team, but I'm posting this now and going to go ahead and approve as I expect both to get approved and we want testing as much as possible before release in ~2 weeks.
r? `@ghost`
@wesleywiserwesleywiser mentioned this pull request Sep 30, 2020
Closed
@SNCPlay42SNCPlay42 mentioned this pull request Apr 11, 2021
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung left review comments
@oli-obkoli-obkoli-obk left review comments
+1 more reviewer
@pnkfelixpnkfelixpnkfelix left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

A-mir-optArea: MIR optimizationsbeta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.47.0

Development

Successfully merging this pull request may close these issues.

11 participants

@wesleywiser@oli-obk@bors@rust-log-analyzer@spastorino@pnkfelix@RalfJung@jonas-schievink@Mark-Simulacrum@rust-highfive@rustbot