Account for gaps in def path table during decoding#79810
Merged
bors merged 1 commit intorust-lang:masterfrom Dec 10, 2020
Merged
Account for gaps in def path table during decoding#79810bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
|
r? @lcnr (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Contributor
Author
|
This resolves the crash in issue #79783. However, I haven't been able to come up with a minimal reproduction yet, so I'm leaving that issue open for now. |
When encoding a proc-macro crate, there may be gaps in the table (since we only encode the crate root and proc-macro items). Account for this by checking if the entry is present, rather than using `unwrap()`
Aaron1011
force-pushed
the
fix/def-path-table-gap
branch
from
162abb1 to
a332e2b
Compare
Contributor
Author
|
@bors r=lcnr |
Collaborator
|
📌 Commit a332e2b has been approved by |
bors
added
S-waiting-on-bors
Member
|
@bors p=1 Resolves a rustc crash on nightly. |
jyn514
added
A-incr-comp
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 9, 2020
Rollup of 12 pull requests Successful merges: - rust-lang#79732 (minor stylistic clippy cleanups) - rust-lang#79750 (Fix trimming of lint docs) - rust-lang#79777 (Remove `first_merge` from liveness debug logs) - rust-lang#79795 (Privatize some of libcore unicode_internals) - rust-lang#79803 (Update xsv to prevent random CI failures) - rust-lang#79810 (Account for gaps in def path table during decoding) - rust-lang#79818 (Fixes to Rust coverage) - rust-lang#79824 (Strip prefix instead of replacing it with empty string) - rust-lang#79826 (Simplify visit_{foreign,trait}_item) - rust-lang#79844 (Move RWUTable to a separate module) - rust-lang#79861 (Update LLVM submodule) - rust-lang#79862 (Remove tab-lock and replace it with ctrl+up/down arrows to switch between search result tabs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
| @@ -1561,9 +1563,12 @@ impl<'a, 'tcx> CrateMetadataRef<'a> { | |||
| let mut map = FxHashMap::with_capacity_and_hasher(end_id as usize, Default::default()); | |||
| for i in 0..end_id { | |||
Contributor
There was a problem hiding this comment.
Late to the party... but if there are gaps, rather than stopping at end_id, do we need to keep iterating until we've processed self.root.tables.def_path_hashes.size() elements?
(Or maybe something more efficient. I'm not familiar with how these tables work.)
Contributor
Author
There was a problem hiding this comment.
The size() method on Lazy<Table> has a somewhat misleading name - it returns the maximum possible value. So, iterating up to end_id guarnatees that we visit all present entries.
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
8 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.
When encoding a proc-macro crate, there may be gaps in the table (since
we only encode the crate root and proc-macro items). Account for this by
checking if the entry is present, rather than using
unwrap()