Work around a resolve bug in const prop by oli-obk · Pull Request #67631 · rust-lang/rust

oli-obk · 2019-12-26T14:10:58Z

r? @wesleywiser @anp

This isn't exposed right now, but further changes to rustc may start causing bugs without this.

wesleywiser · 2019-12-26T14:56:14Z

@bors r+

Thanks!

bors · 2019-12-26T14:56:15Z

📌 Commit 652cec1 has been approved by wesleywiser

wesleywiser · 2019-12-26T19:08:45Z

@bors r+

bors · 2019-12-26T19:08:48Z

📌 Commit 3ab0663 has been approved by wesleywiser

anp · 2019-12-26T19:15:09Z

Confirmed that this will unblock #67137. Thank you!!!

@wesleywiser

…sleywiser Work around a resolve bug in const prop r? @wesleywiser @anp This isn't exposed right now, but further changes to rustc may start causing bugs without this.

@wesleywiser

…sleywiser Work around a resolve bug in const prop r? @wesleywiser @anp This isn't exposed right now, but further changes to rustc may start causing bugs without this.

wesleywiser · 2019-12-27T16:37:28Z

@bors r-

oli-obk · 2019-12-27T16:38:06Z

Let's not do the hack, since @wesleywiser has a real fix

We only want to return specializations when `Reveal::All` is passed, not when `Reveal::UserFacing` is. Resolving this fixes several issues with the `ConstProp`, `SimplifyBranches`, and `Inline` MIR optimization passes. Fixesrust-lang#66901

anp · 2019-12-27T20:57:00Z

Ping on #67662 (comment):

I guess we still need my PR for backwards compatibility of @anp's PR. I'll reopen

wesleywiser · 2019-12-27T22:58:11Z

@bors r+

bors · 2019-12-27T22:58:12Z

📌 Commit 3ab0663 has been approved by wesleywiser

oli-obk · 2019-12-27T23:00:55Z

@bors r-

I still want to do the warning thing

…ate more constants during const prop

oli-obk · 2019-12-28T23:39:13Z

I added one more commit @wesleywiser

It should permit #67137 to not cause a breaking change related to diverging constants, and additionally give us new const_err lints for them.

anp · 2019-12-29T00:08:42Z

Confirmed that this gets my test passing!

wesleywiser · 2019-12-29T00:34:12Z

@bors r+

bors · 2019-12-29T00:34:14Z

📌 Commit 5fd8abd has been approved by wesleywiser

@wesleywiser

…sleywiser Work around a resolve bug in const prop r? @wesleywiser @anp This isn't exposed right now, but further changes to rustc may start causing bugs without this.

bors · 2019-12-30T02:05:29Z

⌛ Testing commit 5fd8abd with merge 214548b...

@wesleywiser

Work around a resolve bug in const prop r? @wesleywiser @anp This isn't exposed right now, but further changes to rustc may start causing bugs without this.

bors · 2019-12-30T05:12:42Z

☀️ Test successful - checks-azure
Approved by: wesleywiser
Pushing 214548b to master...

mati865 · 2019-12-30T16:26:50Z

Is this 1% regression (5% on ctfe) expected?
https://perf.rust-lang.org/compare.html?start=2ba0d2acbd6cb01fb07619628882120d5b66bd59&end=214548b8afd94924c17dea456c8077931009b944&stat=instructions:u

wesleywiser · 2019-12-30T16:46:47Z

Looks like we're potentially calling const_eval_validatedmore now?

https://perf.rust-lang.org/detailed-query.html?commit=214548b8afd94924c17dea456c8077931009b944&base_commit=2ba0d2acbd6cb01fb07619628882120d5b66bd59&benchmark=ctfe-stress-4-check&run_name=baseline%20incremental

oli-obk · 2019-12-30T18:32:04Z

But only in the base incremental runs. everything else is unaffected.

mati865 · 2019-12-30T19:15:46Z

patched incremental has also regressed.

@Centril

Add some regression tests Closesrust-lang#64848 (fixed by rust-lang#67631) Closesrust-lang#65918 (ICE is hidden by rust-lang#67000, no longer ICE) Closesrust-lang#66473 (fixed by rust-lang#68084) Closesrust-lang#67550 (set mir-opt-level to 3) r? @Centril

rust-highfive assigned wesleywiser Dec 26, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 26, 2019

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 Dec 26, 2019

anp mentioned this pull request Dec 26, 2019
libstd uses core::panic::Location where possible. #67137
Merged

Mark-Simulacrum mentioned this pull request Dec 26, 2019
Rollup of 13 pull requests #67643
Closed

JohnTitor mentioned this pull request Dec 27, 2019
Rollup of 10 pull requests #67660
Closed

wesleywiser mentioned this pull request Dec 27, 2019
Fix Instance::resolve() incorrectly returning specialized instances #67662
Merged

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 27, 2019

oli-obk closed this Dec 27, 2019

oli-obk reopened this Dec 27, 2019

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 27, 2019

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 27, 2019

oli-obk added 3 commits December 28, 2019 00:22

Work around a resolve bug in const prop
3eb0585

Prevent polymorphic const prop on assignments
b3abebd

Ensure that we don't cause *new* hard errors if we suddenly can evalu…
5fd8abd
…ate more constants during const prop

oli-obk force-pushed the polymorphic_promotion branch from 3ab0663 to 5fd8abdCompare December 28, 2019 23:26

wesleywiser approved these changes Dec 29, 2019
View reviewed changes

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 29, 2019

Dylan-DPC-zz mentioned this pull request Dec 29, 2019
Rollup of 5 pull requests #67704
Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 30, 2019

bors merged commit 5fd8abd into rust-lang:masterDec 30, 2019

bors mentioned this pull request Dec 30, 2019
Turn const eval queries into canonical queries #67717
Closed

Alexendoo mentioned this pull request Dec 31, 2019
ICE: Associated constant and impl trait #64848
Closed

oli-obk deleted the polymorphic_promotion branch January 1, 2020 19:47

JohnTitor mentioned this pull request Jan 14, 2020
Add some regression tests #68236
Merged

oli-obk mentioned this pull request Feb 10, 2020
Worsened debug build codegen in beta #68855
Closed

Uh oh!

Uh oh!

Conversation

oli-obk commented Dec 26, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wesleywiser commented Dec 26, 2019

Uh oh!

bors commented Dec 26, 2019

Uh oh!

wesleywiser commented Dec 26, 2019

Uh oh!

bors commented Dec 26, 2019

Uh oh!

anp commented Dec 26, 2019

Uh oh!

wesleywiser commented Dec 27, 2019

Uh oh!

oli-obk commented Dec 27, 2019

Uh oh!

anp commented Dec 27, 2019

Uh oh!

wesleywiser commented Dec 27, 2019

Uh oh!

bors commented Dec 27, 2019

Uh oh!

oli-obk commented Dec 27, 2019

Uh oh!

oli-obk commented Dec 28, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anp commented Dec 29, 2019

Uh oh!

wesleywiser commented Dec 29, 2019

Uh oh!

bors commented Dec 29, 2019

Uh oh!

bors commented Dec 30, 2019

Uh oh!

bors commented Dec 30, 2019

Uh oh!

mati865 commented Dec 30, 2019

Uh oh!

wesleywiser commented Dec 30, 2019

Uh oh!

oli-obk commented Dec 30, 2019

Uh oh!

mati865 commented Dec 30, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

oli-obk commented Dec 26, 2019•
edited
Loading

oli-obk commented Dec 28, 2019•
edited
Loading

mati865 commented Dec 30, 2019•
edited
Loading