Skip to content

On-demandify the typechecking of item bodies #40540

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 29, 2017
Merged

On-demandify the typechecking of item bodies #40540

merged 1 commit into from
Mar 29, 2017

Conversation

cramertj
Copy link
Member

nikomatsakis
nikomatsakis requested changes Mar 16, 2017
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

looking good, one minor quibble

src/librustc_typeck/check/mod.rs Outdated
}
}

fn typeck_item_bodies<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, _: CrateNum) {
Copy link
Contributor

Choose a reason for hiding this comment

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

probably a good idea to have assert that the CrateNum is indeed LOCAL_CRATE

@cramertj cramertj force-pushed the check-bodies-as-query branch from 6b59aeb to ee584ac Compare March 18, 2017 04:28
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 20, 2017

📌 Commit ee584ac has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Mar 20, 2017

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

eddyb
eddyb reviewed Mar 21, 2017
View reviewed changes
src/librustc_typeck/check/mod.rs Outdated
tcx.visit_all_bodies_in_krate(|body_owner_def_id, _body_id| {
tcx.item_tables(body_owner_def_id);
});
ty::queries::typeck_item_bodies::get(tcx, DUMMY_SP, LOCAL_CRATE)
Copy link
Member

Choose a reason for hiding this comment

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

Does the separate DepNode::TypeckBodiesKrate task even need to exist?

Copy link
Member Author

@cramertj cramertj Mar 21, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

For the moment, yes, because otherwise it causes and ICE with "read/write of Some(TypeckBodiesKrate) but no current task".

Should I try and fix this here somehow or just add a FIXME?

cc @nikomatsakis

Copy link
Contributor

Choose a reason for hiding this comment

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

I think a FIXME is a good idea.

@cramertj cramertj force-pushed the check-bodies-as-query branch from ee584ac to eacd2da Compare March 21, 2017 10:07
@nikomatsakis nikomatsakis mentioned this pull request Mar 22, 2017
Closed
63 tasks
@cramertj cramertj force-pushed the check-bodies-as-query branch from eacd2da to 8c92044 Compare March 23, 2017 03:18
@cramertj
Copy link
Member Author

@nikomatsakis Added the FIXME. Anything else I should do to this?

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 23, 2017

📌 Commit 8c92044 has been approved by nikomatsakis

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 25, 2017
@alexcrichton
Rollup merge of rust-lang#40540 - cramertj:check-bodies-as-query, r=n…
593b535 
…ikomatsakis

On-demandify the typechecking of item bodies

r? @nikomatsakis
@alexcrichton alexcrichton mentioned this pull request Mar 25, 2017
Closed
bors added a commit that referenced this pull request Mar 25, 2017
@bors
Auto merge of #40810 - alexcrichton:rollup, r=alexcrichton
40ae49a 
Rollup of 11 pull requests

- Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809
- Failed merges: #40771
bors added a commit that referenced this pull request Mar 25, 2017
@bors
Auto merge of #40810 - alexcrichton:rollup, r=alexcrichton
ed9108d 
Rollup of 11 pull requests

- Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809
- Failed merges: #40771
@bors
Copy link
Collaborator

bors commented Mar 25, 2017

🔒 Merge conflict

@bors
Copy link
Collaborator

bors commented Mar 26, 2017

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

@cramertj cramertj force-pushed the check-bodies-as-query branch from 8c92044 to 61cd190 Compare March 26, 2017 20:45
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 27, 2017

📌 Commit 61cd190 has been approved by nikomatsakis

@cramertj cramertj force-pushed the check-bodies-as-query branch from 61cd190 to 8a27a51 Compare March 27, 2017 21:49
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 27, 2017

📌 Commit 8a27a51 has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Mar 29, 2017

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

@frewsxcv frewsxcv mentioned this pull request Mar 29, 2017
Closed
@cramertj cramertj force-pushed the check-bodies-as-query branch from 8a27a51 to 3b10b4e Compare March 29, 2017 03:36
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 29, 2017

📌 Commit 3b10b4e has been approved by nikomatsakis

@bors
Copy link
Collaborator

bors commented Mar 29, 2017

⌛ Testing commit 3b10b4e with merge cf69238...

bors added a commit that referenced this pull request Mar 29, 2017
@bors
Auto merge of #40540 - cramertj:check-bodies-as-query, r=nikomatsakis
cf69238 
On-demandify the typechecking of item bodies

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented Mar 29, 2017

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

@bors bors merged commit 3b10b4e into rust-lang:master Mar 29, 2017
This was referenced Mar 29, 2017
Merged
Merged
@cramertj cramertj deleted the check-bodies-as-query branch September 21, 2017 16:10
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@eddyb eddyb eddyb left review comments

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cramertj @nikomatsakis @bors @eddyb