Track closure signatures & kinds in freshened types by arielb1 · Pull Request #43938 · rust-lang/rust

arielb1 · 2017-08-17T14:38:52Z

Mark-Simulacrum · 2017-08-20T16:31:39Z

Should be possible to call mk_substs on the iterator here.

nikomatsakis

OK, I get the idea here -- this is clever. The other approach that I had been contemplating was slightly different. I had hoped to add facts to the environment indicating when we know the kind of a closure (rather than invoking closure_kind, basically). In this way, we would invalidate the cached entries because there would be a new environment. But I think this is a simpler thing to do for now for sure (and maybe forever -- since I was worried about screwing up the caching results of other things if we grow the param env).

nikomatsakis · 2017-08-21T21:24:49Z

feels like some comments laying out the strategy here would be very welcome

@remram44

After a projection was processed, its derived subobligations no longer need any processing when encountered, and can be removed. This improves the status of rust-lang#43787. This is actually complementary to rust-lang#43938 - that PR fixes selection caching (and @remram44's example, which "accidentally" worked because of the buggy projection caching) while this PR fixes projection caching

arielb1 · 2017-08-27T17:04:37Z

Now with cleaner code & comments & hopefully ready for landing!

arielb1 · 2017-08-27T17:06:49Z

NOTE: this PR will require some changes after #43076 lands, so I'll have this (unchanged) version for beta and a modified version for master.

bors · 2017-08-28T19:25:45Z

☔ The latest upstream changes (presumably #43076) made this pull request unmergeable. Please resolve the merge conflicts.

@remram44

clear out projection subobligations after they are processed After a projection was processed, its derived subobligations no longer need any processing when encountered, and can be removed. This improves the status of #43787. This is actually complementary to #43938 - that PR fixes selection caching (and @remram44's example, which "accidentally" worked because of the buggy projection caching) while this PR fixes projection caching. r? @nikomatsakis

@remram44

This allows caching closure signatures and kinds in the normal selection and evaluation caches, and fixes the exponential worst-case in @remram44's example, which is a part of rust-lang#43787. This improvement is complenentary to rust-lang#43999 - they fix different cases.

arielb1 · 2017-08-29T11:17:37Z

Rebased

nikomatsakis · 2017-08-29T12:58:22Z

+//! comparisons (for caching), it is possible to do a `ty::_match` operation between
+//! 2 freshened types - this works even with the closure encoding.
+//!
+//! __An important detail concerning regions.__ The freshener also replaces *all* free regions with


nice comments

nikomatsakis · 2017-08-29T13:33:03Z

@bors r+

bors · 2017-08-29T13:33:04Z

📌 Commit 75d6820 has been approved by nikomatsakis

bors · 2017-08-29T13:58:50Z

⌛ Testing commit 75d6820 with merge 2edfd62c37290bd1a24da88a4aee315ed4c1cfdf...

bors · 2017-08-29T16:10:10Z

💔 Test failed - status-travis

arielb1 · 2017-08-29T17:11:57Z

Spurious failure while installing deploy dependencies #44159 (I think - this looks spurious)

@bors retry

arielb1 · 2017-08-29T18:17:47Z

Please don't roll this up as this is a performance improvement PR.

Mark-Simulacrum · 2017-08-29T22:35:36Z

@bors p=100

@nikomatsakis

Track closure signatures & kinds in freshened types r? @nikomatsakis

bors · 2017-08-30T00:25:30Z

⌛ Testing commit 75d6820 with merge 09ea6b7...

bors · 2017-08-30T02:56:42Z

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing 09ea6b7 to master...

@remram44

[beta] Track closure signatures & kinds in freshened types This allows caching closure signatures and kinds in the normal selection and evaluation caches, and fixes the exponential worst-case in @remram44's example, which is a part of #43787. This improvement is complenentary to #43999 - they fix different cases. This is the pre-generators variation of #43938, cloned for beta.

@remram44

After a projection was processed, its derived subobligations no longer need any processing when encountered, and can be removed. This improves the status of rust-lang#43787. This is actually complementary to rust-lang#43938 - that PR fixes selection caching (and @remram44's example, which "accidentally" worked because of the buggy projection caching) while this PR fixes projection caching

rust-highfive assigned nikomatsakis Aug 17, 2017

arielb1 mentioned this pull request Aug 20, 2017
clear out projection subobligations after they are processed #43999
Merged

Mark-Simulacrum reviewed Aug 20, 2017
View reviewed changes

Comment threadsrc/librustc/infer/freshen.rs Outdated
Mark-SimulacrumAug 20, 2017
Copy link
Copy Markdown
Member
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be possible to call mk_substs on the iterator here.

nikomatsakis approved these changes Aug 21, 2017
View reviewed changes

arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 22, 2017

arielb1 force-pushed the closure-key branch from 529643b to b2a4661Compare August 27, 2017 17:04

arielb1 changed the title ~~[WIP] track closure signatures & kinds in freshened types~~Track closure signatures & kinds in freshened typesAug 27, 2017

arielb1 changed the title ~~Track closure signatures & kinds in freshened types~~[Waiting For Generators] Track closure signatures & kinds in freshened typesAug 27, 2017

arielb1 mentioned this pull request Aug 29, 2017
[beta] Track closure signatures & kinds in freshened types #44148
Merged

arielb1 changed the title ~~[Waiting For Generators] Track closure signatures & kinds in freshened types~~Track closure signatures & kinds in freshened typesAug 29, 2017

arielb1 force-pushed the closure-key branch from b2a4661 to 75d6820Compare August 29, 2017 11:17

nikomatsakis reviewed Aug 29, 2017
View reviewed changes

nikomatsakis approved these changes Aug 29, 2017
View reviewed changes

arielb1 mentioned this pull request Aug 29, 2017
Spurious failure while installing deploy dependencies #44159
Closed

arielb1 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 Aug 29, 2017

bors added a commit that referenced this pull request Aug 30, 2017
Auto merge of#43938- arielb1:closure-key, r=nikomatsakis
09ea6b7
Track closure signatures & kinds in freshened types r? @nikomatsakis

bors merged commit 75d6820 into rust-lang:masterAug 30, 2017

arielb1 mentioned this pull request Dec 24, 2017
FIXME: ObligationForest assumptions incorrect #32286
Closed

Uh oh!

Uh oh!

Conversation

arielb1 commented Aug 17, 2017

Uh oh!

Mark-SimulacrumAug 20, 2017

Choose a reason for hiding this comment

Uh oh!

nikomatsakis left a comment

Choose a reason for hiding this comment

Uh oh!

nikomatsakisAug 21, 2017

Choose a reason for hiding this comment

Uh oh!

arielb1 commented Aug 27, 2017

Uh oh!

arielb1 commented Aug 27, 2017

Uh oh!

bors commented Aug 28, 2017

Uh oh!

arielb1 commented Aug 29, 2017

Uh oh!

nikomatsakisAug 29, 2017

Choose a reason for hiding this comment

Uh oh!

nikomatsakis commented Aug 29, 2017

Uh oh!

bors commented Aug 29, 2017

Uh oh!

bors commented Aug 29, 2017

Uh oh!

bors commented Aug 29, 2017

Uh oh!

arielb1 commented Aug 29, 2017

Uh oh!

arielb1 commented Aug 29, 2017

Uh oh!

Mark-Simulacrum commented Aug 29, 2017

Uh oh!

bors commented Aug 30, 2017

Uh oh!

bors commented Aug 30, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants