nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a bitset instead of a hash map in HIR ID validator

Browse Source
This commit is contained in:
Jakub Beránek 2022-07-03 13:35:48 +02:00
parent 8c52a83c45
commit 2a57e5efed
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_index/src/bit_set.rs
View File

@ -1546,6 +1546,16 @@ impl<T: Idx> GrowableBitSet<T> {
let (word_index, mask) = word_index_and_mask(elem);
self.bit_set.words.get(word_index).map_or(false, |word| (word & mask) != 0)
}
#[inline]
pub fn iter(&self) -> BitIter<'_, T> {
self.bit_set.iter()
}
#[inline]
pub fn len(&self) -> usize {
self.bit_set.count()
}
}
impl<T: Idx> From<BitSet<T>> for GrowableBitSet<T> {

8
compiler/rustc_passes/src/hir_id_validator.rs
View File

@ -1,9 +1,9 @@
use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::sync::Lock;
use rustc_hir as hir;
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
use rustc_hir::intravisit;
use rustc_hir::{HirId, ItemLocalId};
use rustc_index::bit_set::GrowableBitSet;
use rustc_middle::hir::map::Map;
use rustc_middle::hir::nested_filter;
use rustc_middle::ty::TyCtxt;
@ -40,7 +40,7 @@ pub fn check_crate(tcx: TyCtxt<'_>) {
struct HirIdValidator<'a, 'hir> {
hir_map: Map<'hir>,
owner: Option<LocalDefId>,
hir_ids_seen: FxHashSet<ItemLocalId>,
hir_ids_seen: GrowableBitSet<ItemLocalId>,
errors: &'a Lock<Vec<String>>,
}
@ -80,7 +80,7 @@ impl<'a, 'hir> HirIdValidator<'a, 'hir> {
if max != self.hir_ids_seen.len() - 1 {
// Collect the missing ItemLocalIds
let missing: Vec<_> = (0..=max as u32)
.filter(|&i| !self.hir_ids_seen.contains(&ItemLocalId::from_u32(i)))
.filter(|&i| !self.hir_ids_seen.contains(ItemLocalId::from_u32(i)))
.collect();
// Try to map those to something more useful
@ -106,7 +106,7 @@ impl<'a, 'hir> HirIdValidator<'a, 'hir> {
missing_items,
self.hir_ids_seen
.iter()
.map(|&local_id| HirId { owner, local_id })
.map(|local_id| HirId { owner, local_id })
.map(|h| format!("({:?} {})", h, self.hir_map.node_to_string(h)))
.collect::<Vec<_>>()
)