Skip to content

/rust

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

Reviewers

@nikomatsakis nikomatsakis

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
5 participants
@michaelwoerister @bors @nikomatsakis @kennytm @carols10cents
@michaelwoerister
Copy link
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

@rust-highfive rust-highfive assigned nikomatsakis Nov 27, 2017

@carols10cents carols10cents added the S-waiting-on-review label Nov 27, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 27, 2017

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

nikomatsakis approved these changes Nov 27, 2017
View changes

src/librustc_metadata/decoder.rs
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.

Sign in to view
Copy link
@nikomatsakis

nikomatsakis Nov 27, 2017

Contributor

that's...a cute trick

This comment has been minimized.

Sign in to view
Copy link
@michaelwoerister

michaelwoerister Nov 28, 2017

Author Contributor

Right? :)
I poached it from @arielb1.
@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor

nikomatsakis commented Nov 27, 2017

r=me after rebase

@michaelwoerister michaelwoerister force-pushed the michaelwoerister:incr-comp-krimskrams branch from 2a2783b to 3bb25d6 Nov 28, 2017

@michaelwoerister

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

michaelwoerister commented Nov 28, 2017

@bors r=nikomatsakis
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 28, 2017

📌 Commit 3bb25d6 has been approved by nikomatsakis

@kennytm kennytm added S-waiting-on-bors and removed S-waiting-on-review labels Nov 28, 2017

@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 29, 2017

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

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

@bors
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
Loading status checks…
1d14317
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Nov 29, 2017

💔 Test failed - status-travis

@scottmcm scottmcm referenced this pull request Nov 29, 2017

Closed

All bors builds failing on xcode 7.3 #46357

@michaelwoerister

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

michaelwoerister commented Nov 29, 2017

Looks spurious.
@bors retry
@michaelwoerister

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

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.

Sign in to view
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

@bors
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
Loading status checks…
4fa202d
@bors

This comment has been minimized.

Sign in to view
Copy link
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

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

This was referenced Nov 30, 2017

Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.