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

incr.comp.: Some preparatory work for caching more query results. #46299

Merged
merged 3 commits into from
Nov 30, 2017

Conversation

michaelwoerister
Copy link
Member

This PR

  • adds and updates some encoding/decoding routines for various query result types so they can be cached later, and
  • adds missing [input] annotations for a few DepNode variants.

The situation around having to explicitly mark dep-nodes/queries as inputs is not really satisfactory. I hope we can find a way of making this more fool-proof in the future.

r? @nikomatsakis

@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 27, 2017
@bors
Copy link
Contributor

bors commented Nov 27, 2017

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

for DecodeContext<'a, 'tcx> {
#[inline]
fn specialized_decode(&mut self) -> Result<mir::ClearCrossCrate<T>, Self::Error> {
Ok(mir::ClearCrossCrate::Clear)
Copy link
Contributor

Choose a reason for hiding this comment

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

that's...a cute trick

Copy link
Member Author

Choose a reason for hiding this comment

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

Right? :)
I poached it from @arielb1.

@nikomatsakis
Copy link
Contributor

r=me after rebase

@michaelwoerister
Copy link
Member Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Nov 28, 2017

📌 Commit 3bb25d6 has been approved by nikomatsakis

@kennytm kennytm 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 28, 2017
@bors
Copy link
Contributor

bors commented Nov 29, 2017

⌛ Testing commit 3bb25d6 with merge 1d1431789b75ee49dd1c3f506d409ce0b071efa2...

@bors
Copy link
Contributor

bors commented Nov 29, 2017

💔 Test failed - status-travis

@michaelwoerister
Copy link
Member Author

Looks spurious.
@bors retry

@michaelwoerister
Copy link
Member Author

@bors p=1

(A while back we decided that incr. comp. PRs get higher priority until the end of the year. Since there are 4 incr. comp. PRs open in parallel at the moment, with more to come, I'm taking advantage of this now)

@bors
Copy link
Contributor

bors commented Nov 30, 2017

⌛ Testing commit 3bb25d6 with merge 4fa202d...

bors added a commit that referenced this pull request Nov 30, 2017
…atsakis

incr.comp.: Some preparatory work for caching more query results.

This PR
* adds and updates some encoding/decoding routines for various query result types so they can be cached later, and
* adds missing `[input]` annotations for a few `DepNode` variants.

The situation around having to explicitly mark dep-nodes/queries as inputs is not really satisfactory. I hope we can find a way of making this more fool-proof in the future.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Nov 30, 2017

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants