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

Only hash dep node indices of deps of anon tasks #60573

Merged
merged 1 commit into from
May 7, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented May 6, 2019

Another change split out from #60035.

r? @michaelwoerister

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 6, 2019
@@ -1021,25 +1021,17 @@ impl CurrentDepGraph {
fn complete_anon_task(&mut self, kind: DepKind, task_deps: TaskDeps) -> DepNodeIndex {
debug_assert!(!kind.is_eval_always());

let mut fingerprint = self.anon_id_seed;
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a comment explaining why this works? Especially why it is OK to stable-hash unstable data like DepNodeIndex values?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@michaelwoerister
Copy link
Member

@bors try

@bors
Copy link
Collaborator

bors commented May 6, 2019

⌛ Trying commit 6851874 with merge 21eb9aa...

bors added a commit that referenced this pull request May 6, 2019
Only hash dep node indices of deps of anon tasks

Another change split out from #60035.

r? @michaelwoerister
@Zoxc Zoxc force-pushed the dep-stream-prefix-2 branch from 6851874 to 97d3ad0 Compare May 6, 2019 11:57
@michaelwoerister
Copy link
Member

Thanks, @Zoxc! The queue is enticingly empty right now, so @bors r+

We'll get perf results from the regular build.

@bors
Copy link
Collaborator

bors commented May 6, 2019

📌 Commit 97d3ad0 has been approved by michaelwoerister

@bors bors 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 May 6, 2019
@bors
Copy link
Collaborator

bors commented May 7, 2019

⌛ Testing commit 97d3ad0 with merge c6ac575...

bors added a commit that referenced this pull request May 7, 2019
Only hash dep node indices of deps of anon tasks

Another change split out from #60035.

r? @michaelwoerister
@bors
Copy link
Collaborator

bors commented May 7, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: michaelwoerister
Pushing c6ac575 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 7, 2019
@bors bors merged commit 97d3ad0 into rust-lang:master May 7, 2019
@Zoxc Zoxc deleted the dep-stream-prefix-2 branch May 8, 2019 09:44
@michaelwoerister
Copy link
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

4 participants