incr. comp.: Take spans into account for ICH#36025
Merged
bors merged 14 commits intorust-lang:masterfrom Sep 6, 2016
Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Member
Author
There was a problem hiding this comment.
TODO: Rename this to CachingCodemapView.
Collaborator
|
☔ The latest upstream changes (presumably #36030) made this pull request unmergeable. Please resolve the merge conflicts. |
michaelwoerister
force-pushed
the
incr-comp-hash-spans
branch
from
4dcf193 to
e063f41
Compare
michaelwoerister
changed the title
Member
Author
|
This is ready for review now. |
| // collect a deterministic hash of def-ids that we have seen | ||
| def_path_hashes: &'a mut DefPathHashes<'hash, 'tcx>, | ||
| hash_spans: bool, | ||
| codemap: CachedCodemapView<'tcx>, |
Contributor
There was a problem hiding this comment.
Nit: I think it would be better if this lived one level up, next to the DefPathHashes, so that we can cache across items.
Contributor
|
r=me modulo comments about span hashing |
Member
Author
|
@bors r=nikomatsakis |
Collaborator
|
📌 Commit 4549b6b has been approved by |
Collaborator
|
☔ The latest upstream changes (presumably #35718) made this pull request unmergeable. Please resolve the merge conflicts. |
michaelwoerister
force-pushed
the
incr-comp-hash-spans
branch
from
4549b6b to
7310a8f
Compare
Member
Author
|
@bors r=nikomatsakis rebased. |
Collaborator
|
📌 Commit 7310a8f has been approved by |
Collaborator
|
⌛ Testing commit 7310a8f with merge 4c70c01... |
Collaborator
|
💔 Test failed - auto-win-gnu-32-opt-rustbuild |
Member
Author
|
@bors retry |
Member
Author
|
@bors r- Want to take a look at the failed test on travis first... |
Member
Author
|
@bors retry Couldn't reproduce the test failure. |
Member
Author
|
@bors r=nikomatsakis |
Collaborator
|
📌 Commit 7310a8f has been approved by |
Collaborator
|
⌛ Testing commit 7310a8f with merge 3af7da5... |
Collaborator
|
💔 Test failed - auto-win-msvc-64-cargotest |
Member
Author
|
Can reproduce, will investigate... |
Contributor
|
r=me on the last commit |
Member
Author
|
@bors r=nikomatsakis |
Collaborator
|
📌 Commit 3057b7b has been approved by |
Collaborator
|
⌛ Testing commit 3057b7b with merge 923bac4... |
bors
added a commit
that referenced
this pull request
Sep 6, 2016
…atsakis incr. comp.: Take spans into account for ICH This PR makes the ICH (incr. comp. hash) take spans into account when debuginfo is enabled. A side-effect of this is that the SVH (which is based on the ICHs of all items in the crate) becomes sensitive to the tiniest change in a code base if debuginfo is enabled. Since we are not trying to model ABI compatibility via the SVH anymore (this is done via the crate disambiguator now), this should be not be a problem. Fixes #33888. Fixes #32753.
Collaborator
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Apr 7, 2026
This impl skips over a handful of attributes as if they aren't there. This skipping originated all the way back in rust-lang#36025, and was extended a couple of times, e.g. in rust-lang#36370. Those PRs don't have any explanation of why the skipping exists. Removing the impl (and falling back to the default impl for `[T]`) doesn't seem to have any effects.
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Apr 7, 2026
This impl skips: - All doc comments - A handful of other attributes, mostly `rustc_*` ones related to incremental compilation testing. This skipping originated in rust-lang#36025 and was extended a couple of times, e.g. in rust-lang#36370. Those PRs don't have any explanation of why the skipping exists. Perhaps the reasoning was that doc comments should only affect rustdoc and rustdoc doesn't use incremental compilation? But doc comments end up in metadata, and there is a query `attrs_for_def` that returns a `&'tcx [hir::Attribute]`. So skipping some attributes just seems plainly wrong. This commit removes the impl, which means `[hir::Attribute]` hashing falls back to the default impl for `[T]`. This has no noticeable effect on the test suite. It does slightly hurt performance, because of the doc comments. This perf regression seems worth it for the correcteness benefits.
nnethercote
added a commit
to nnethercote/rust
that referenced
this pull request
Apr 7, 2026
This impl skips: - All doc comments - A handful of other attributes, mostly `rustc_*` ones related to incremental compilation testing. This skipping originated in rust-lang#36025 and was extended a couple of times, e.g. in rust-lang#36370. Those PRs don't have any explanation of why the skipping exists. Perhaps the reasoning was that doc comments should only affect rustdoc and rustdoc doesn't use incremental compilation? But doc comments end up in metadata, and there is a query `attrs_for_def` that returns a `&'tcx [hir::Attribute]`. So skipping some attributes just seems plainly wrong. This commit removes the impl, which means `[hir::Attribute]` hashing falls back to the default impl for `[T]`. This has no noticeable effect on the test suite. It does slightly hurt performance, because of the doc comments. This perf regression seems worth it for the correctness benefits.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR makes the ICH (incr. comp. hash) take spans into account when debuginfo is enabled.
A side-effect of this is that the SVH (which is based on the ICHs of all items in the crate) becomes sensitive to the tiniest change in a code base if debuginfo is enabled. Since we are not trying to model ABI compatibility via the SVH anymore (this is done via the crate disambiguator now), this should be not be a problem.
Fixes #33888.
Fixes #32753.