Skip to content

Hash DefId in rustc_span. #86180

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

Merged
merged 3 commits into from
Jun 12, 2021
Merged

Hash DefId in rustc_span. #86180

merged 3 commits into from
Jun 12, 2021

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jun 9, 2021

This is mostly just moving code around. Changes are simplifications of unneeded callbacks from rustc_span to rustc_middle.

r? @petrochenkov

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2021
@cjgillot
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 10, 2021
@bors
Copy link
Collaborator

bors commented Jun 10, 2021

⌛ Trying commit 4690c4e5acfdc04f0393dff3a3a89ad03779b563 with merge dd1f2ebeae2c9a3f58ba84a82114e3a881cd8a5c...

@bors
Copy link
Collaborator

bors commented Jun 10, 2021

☀️ Try build successful - checks-actions
Build commit: dd1f2ebeae2c9a3f58ba84a82114e3a881cd8a5c (dd1f2ebeae2c9a3f58ba84a82114e3a881cd8a5c)

@rust-timer
Copy link
Collaborator

Queued dd1f2ebeae2c9a3f58ba84a82114e3a881cd8a5c with parent c5fbcd3, future comparison URL.

@petrochenkov petrochenkov removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 10, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (dd1f2ebeae2c9a3f58ba84a82114e3a881cd8a5c): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jun 10, 2021
@petrochenkov
Copy link
Contributor

petrochenkov commented Jun 10, 2021

#86180 (comment) looks like a very minor but pretty consistent regression.
Perhaps it's better to keep/add methods for more effective hashing of LocalDefId and CrateNum (without going through full DefId) even if they are only used in fn update_disambiguator.

(Their default implementation may go through full DefId though.)

UPD: DummyHashStableContext is used for hashing ExpnData which contains so much data that optimizing CrateNum hashing shouldn't make any difference, so the perf difference is most likely a noise and this comment can be ignored.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 10, 2021
@petrochenkov petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 11, 2021
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 11, 2021

📌 Commit 72e9589 has been approved by petrochenkov

@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 Jun 11, 2021
@bors
Copy link
Collaborator

bors commented Jun 12, 2021

⌛ Testing commit 72e9589 with merge 0f6ba39...

@bors
Copy link
Collaborator

bors commented Jun 12, 2021

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 0f6ba39 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2021
@bors bors merged commit 0f6ba39 into rust-lang:master Jun 12, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 12, 2021
@cjgillot cjgillot deleted the defmv branch June 12, 2021 17:23
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.

6 participants