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

Projects
None yet
5 participants
@michaelwoerister
Contributor

michaelwoerister commented Nov 27, 2017

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

This comment has been minimized.

Show comment
Hide comment
@bors

bors Nov 27, 2017

Contributor

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

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)

This comment has been minimized.

@nikomatsakis

nikomatsakis Nov 27, 2017

Contributor

that's...a cute trick

@nikomatsakis

nikomatsakis Nov 27, 2017

Contributor

that's...a cute trick

This comment has been minimized.

@michaelwoerister

michaelwoerister Nov 28, 2017

Contributor

Right? :)
I poached it from @arielb1.

@michaelwoerister

michaelwoerister Nov 28, 2017

Contributor

Right? :)
I poached it from @arielb1.

@nikomatsakis

This comment has been minimized.

Show comment
Hide comment
@nikomatsakis

nikomatsakis Nov 27, 2017

Contributor

r=me after rebase

Contributor

nikomatsakis commented Nov 27, 2017

r=me after rebase

@michaelwoerister

This comment has been minimized.

Show comment
Hide comment
@michaelwoerister

michaelwoerister Nov 28, 2017

Contributor

@bors r=nikomatsakis

Contributor

michaelwoerister commented Nov 28, 2017

@bors r=nikomatsakis

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Nov 28, 2017

Contributor

📌 Commit 3bb25d6 has been approved by nikomatsakis

Contributor

bors commented Nov 28, 2017

📌 Commit 3bb25d6 has been approved by nikomatsakis

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Nov 29, 2017

Contributor

⌛️ Testing commit 3bb25d6 with merge 1d14317...

Contributor

bors commented Nov 29, 2017

⌛️ Testing commit 3bb25d6 with merge 1d14317...

bors added a commit that referenced this pull request Nov 29, 2017

Auto merge of #46299 - michaelwoerister:incr-comp-krimskrams, r=nikom…
…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

This comment has been minimized.

Show comment
Hide comment
@bors

bors Nov 29, 2017

Contributor

💔 Test failed - status-travis

Contributor

bors commented Nov 29, 2017

💔 Test failed - status-travis

@michaelwoerister

This comment has been minimized.

Show comment
Hide comment
@michaelwoerister

michaelwoerister Nov 29, 2017

Contributor

Looks spurious.
@bors retry

Contributor

michaelwoerister commented Nov 29, 2017

Looks spurious.
@bors retry

@michaelwoerister

This comment has been minimized.

Show comment
Hide comment
@michaelwoerister

michaelwoerister Nov 30, 2017

Contributor

@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)

Contributor

michaelwoerister commented Nov 30, 2017

@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

This comment has been minimized.

Show comment
Hide comment
@bors

bors Nov 30, 2017

Contributor

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

Contributor

bors commented Nov 30, 2017

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

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

Auto merge of #46299 - michaelwoerister:incr-comp-krimskrams, r=nikom…
…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

This comment has been minimized.

Show comment
Hide comment
@bors

bors Nov 30, 2017

Contributor

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

Contributor

bors commented Nov 30, 2017

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

@bors bors merged commit 3bb25d6 into rust-lang:master Nov 30, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment