From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:02:58 +0200 Subject: Adding upstream version 1.64.0+dfsg1. Signed-off-by: Daniel Baumann --- compiler/rustc_passes/src/hir_id_validator.rs | 164 ++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 compiler/rustc_passes/src/hir_id_validator.rs (limited to 'compiler/rustc_passes/src/hir_id_validator.rs') diff --git a/compiler/rustc_passes/src/hir_id_validator.rs b/compiler/rustc_passes/src/hir_id_validator.rs new file mode 100644 index 000000000..212ea9e57 --- /dev/null +++ b/compiler/rustc_passes/src/hir_id_validator.rs @@ -0,0 +1,164 @@ +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; + +pub fn check_crate(tcx: TyCtxt<'_>) { + tcx.dep_graph.assert_ignored(); + + if tcx.sess.opts.unstable_opts.hir_stats { + crate::hir_stats::print_hir_stats(tcx); + } + + #[cfg(debug_assertions)] + { + let errors = Lock::new(Vec::new()); + let hir_map = tcx.hir(); + + hir_map.par_for_each_module(|module_id| { + let mut v = HirIdValidator { + hir_map, + owner: None, + hir_ids_seen: Default::default(), + errors: &errors, + }; + + tcx.hir().visit_item_likes_in_module(module_id, &mut v); + }); + + let errors = errors.into_inner(); + + if !errors.is_empty() { + let message = errors.iter().fold(String::new(), |s1, s2| s1 + "\n" + s2); + tcx.sess.delay_span_bug(rustc_span::DUMMY_SP, &message); + } + } +} + +struct HirIdValidator<'a, 'hir> { + hir_map: Map<'hir>, + owner: Option, + hir_ids_seen: GrowableBitSet, + errors: &'a Lock>, +} + +impl<'a, 'hir> HirIdValidator<'a, 'hir> { + fn new_visitor(&self, hir_map: Map<'hir>) -> HirIdValidator<'a, 'hir> { + HirIdValidator { + hir_map, + owner: None, + hir_ids_seen: Default::default(), + errors: self.errors, + } + } + + #[cold] + #[inline(never)] + fn error(&self, f: impl FnOnce() -> String) { + self.errors.lock().push(f()); + } + + fn check)>(&mut self, owner: LocalDefId, walk: F) { + assert!(self.owner.is_none()); + self.owner = Some(owner); + walk(self); + + if owner == CRATE_DEF_ID { + return; + } + + // There's always at least one entry for the owning item itself + let max = self + .hir_ids_seen + .iter() + .map(|local_id| local_id.as_usize()) + .max() + .expect("owning item has no entry"); + + 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))) + .collect(); + + // Try to map those to something more useful + let mut missing_items = Vec::with_capacity(missing.len()); + + for local_id in missing { + let hir_id = HirId { owner, local_id: ItemLocalId::from_u32(local_id) }; + + trace!("missing hir id {:#?}", hir_id); + + missing_items.push(format!( + "[local_id: {}, owner: {}]", + local_id, + self.hir_map.def_path(owner).to_string_no_crate_verbose() + )); + } + self.error(|| { + format!( + "ItemLocalIds not assigned densely in {}. \ + Max ItemLocalId = {}, missing IDs = {:?}; seens IDs = {:?}", + self.hir_map.def_path(owner).to_string_no_crate_verbose(), + max, + missing_items, + self.hir_ids_seen + .iter() + .map(|local_id| HirId { owner, local_id }) + .map(|h| format!("({:?} {})", h, self.hir_map.node_to_string(h))) + .collect::>() + ) + }); + } + } +} + +impl<'a, 'hir> intravisit::Visitor<'hir> for HirIdValidator<'a, 'hir> { + type NestedFilter = nested_filter::OnlyBodies; + + fn nested_visit_map(&mut self) -> Self::Map { + self.hir_map + } + + fn visit_item(&mut self, i: &'hir hir::Item<'hir>) { + let mut inner_visitor = self.new_visitor(self.hir_map); + inner_visitor.check(i.def_id, |this| intravisit::walk_item(this, i)); + } + + fn visit_id(&mut self, hir_id: HirId) { + let owner = self.owner.expect("no owner"); + + if owner != hir_id.owner { + self.error(|| { + format!( + "HirIdValidator: The recorded owner of {} is {} instead of {}", + self.hir_map.node_to_string(hir_id), + self.hir_map.def_path(hir_id.owner).to_string_no_crate_verbose(), + self.hir_map.def_path(owner).to_string_no_crate_verbose() + ) + }); + } + + self.hir_ids_seen.insert(hir_id.local_id); + } + + fn visit_foreign_item(&mut self, i: &'hir hir::ForeignItem<'hir>) { + let mut inner_visitor = self.new_visitor(self.hir_map); + inner_visitor.check(i.def_id, |this| intravisit::walk_foreign_item(this, i)); + } + + fn visit_trait_item(&mut self, i: &'hir hir::TraitItem<'hir>) { + let mut inner_visitor = self.new_visitor(self.hir_map); + inner_visitor.check(i.def_id, |this| intravisit::walk_trait_item(this, i)); + } + + fn visit_impl_item(&mut self, i: &'hir hir::ImplItem<'hir>) { + let mut inner_visitor = self.new_visitor(self.hir_map); + inner_visitor.check(i.def_id, |this| intravisit::walk_impl_item(this, i)); + } +} -- cgit v1.2.3