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

Reland "Merge CrateDisambiguator into StableCrateId" #86143

Merged

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jun 8, 2021

Reverts #85891 as this revert of #85804 made perf even worse.

r? @Mark-Simulacrum

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

bjorn3 commented Jun 8, 2021

@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 8, 2021
@bors
Copy link
Contributor

bors commented Jun 8, 2021

⌛ Trying commit 7b9344569e580ced3c0b4ded3675666e54da53a2 with merge 35615666ae78a7f7a1285b121d646fa27b66a48b...

@rust-log-analyzer

This comment has been minimized.

@petrochenkov
Copy link
Contributor

Reverts #85891 as this revert of #85804 made perf even worse.

inb4 this PR makes performance worse once again

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 8, 2021

@rust-timer build 35615666ae78a7f7a1285b121d646fa27b66a48b

@rust-timer
Copy link
Collaborator

Queued 35615666ae78a7f7a1285b121d646fa27b66a48b with parent a50d721, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (35615666ae78a7f7a1285b121d646fa27b66a48b): 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 removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 8, 2021
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 8, 2021

Perf is positive.

@michaelwoerister
Copy link
Member

Are we sure that the crate-disambiguator concept isn't user facing?

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 10, 2021

StableCrateId takes the place of crate disambiguator. The fact that different crates with the same name, but different -Cmetadata can be linked together, but with the same -Cmetadata can't is user-facing. StableCrateId contains both the crate name and -Cmetadata meaning that this linking behavior is still the case. I don't think there is any other user-facing way for crate disambiguators. The new symbol mangling scheme uses the crate disambiguator and now stable crate id, but we don't guarantee anything about this hash anyway, not even that it is a hash I think. I think a random number would also be a valid implementation.

@michaelwoerister
Copy link
Member

OK, I'm convinced. The StableCrateId can still be viewed as a crate disambiguator.

@bors
Copy link
Contributor

bors commented Jun 17, 2021

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

@bjorn3 bjorn3 force-pushed the revert_revert_merge_crate_disambiguator branch from f8952cf to 0daecc5 Compare June 17, 2021 12:16
@bjorn3
Copy link
Member Author

bjorn3 commented Jun 17, 2021

@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 17, 2021
@bors
Copy link
Contributor

bors commented Jun 17, 2021

⌛ Trying commit 0daecc5012cb1f19d79c782484d67fbdd71af78b with merge 5082b9fb6e9772786e675fcabf28d3971db2e657...

@bors
Copy link
Contributor

bors commented Jun 17, 2021

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

@rust-timer
Copy link
Collaborator

Queued 5082b9fb6e9772786e675fcabf28d3971db2e657 with parent b17d9c1, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (5082b9fb6e9772786e675fcabf28d3971db2e657): 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 removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 17, 2021
@bjorn3 bjorn3 force-pushed the revert_revert_merge_crate_disambiguator branch from 5eb0120 to dde20af Compare July 6, 2021 09:28
@rust-log-analyzer

This comment has been minimized.

@bjorn3 bjorn3 force-pushed the revert_revert_merge_crate_disambiguator branch from dde20af to 56c6a48 Compare July 6, 2021 09:36
@bjorn3
Copy link
Member Author

bjorn3 commented Jul 6, 2021

Dropped 158d3b9 as the size of DepNode doesn't change anymore.

@bjorn3
Copy link
Member Author

bjorn3 commented Jul 6, 2021

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Jul 6, 2021

📌 Commit 56c6a48 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-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 6, 2021
@bors
Copy link
Contributor

bors commented Jul 6, 2021

⌛ Testing commit 56c6a48 with merge d04ec47...

@bors
Copy link
Contributor

bors commented Jul 6, 2021

☀️ Test successful - checks-actions
Approved by: michaelwoerister
Pushing d04ec47 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2021
@bors bors merged commit d04ec47 into rust-lang:master Jul 6, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 6, 2021
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #86143!

Tested on commit d04ec47.
Direct link to PR: #86143

💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 6, 2021
Tested on commit rust-lang/rust@d04ec47.
Direct link to PR: <rust-lang/rust#86143>

💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
@bjorn3 bjorn3 deleted the revert_revert_merge_crate_disambiguator branch March 14, 2022 12:15
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.

9 participants