-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Introduce HirId, a replacement for ast::NodeId after lowering to HIR #40518
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
Merged
+1,541
−859
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9e0589a
Add resize() method to IndexVec.
michaelwoerister 559127b
Implement indexed_vec::Idx for ast::NodeId
michaelwoerister bc259ee
Introduce HirId, a replacement for NodeId after lowering to HIR.
michaelwoerister 090767b
Allocate numerical values of DefIndexes from two seperate ranges.
michaelwoerister File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| // Copyright 2017 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| use hir::def_id::{DefId, DefIndex, CRATE_DEF_INDEX}; | ||
| use hir::{self, intravisit, HirId, ItemLocalId}; | ||
| use syntax::ast::NodeId; | ||
| use hir::itemlikevisit::ItemLikeVisitor; | ||
| use rustc_data_structures::fx::FxHashMap; | ||
|
|
||
| pub fn check_crate<'hir>(hir_map: &hir::map::Map<'hir>) { | ||
| let mut outer_visitor = OuterVisitor { | ||
| hir_map: hir_map, | ||
| errors: vec![], | ||
| }; | ||
|
|
||
| hir_map.dep_graph.with_ignore(|| { | ||
| hir_map.krate().visit_all_item_likes(&mut outer_visitor); | ||
| if !outer_visitor.errors.is_empty() { | ||
| let message = outer_visitor | ||
| .errors | ||
| .iter() | ||
| .fold(String::new(), |s1, s2| s1 + "\n" + s2); | ||
| bug!("{}", message); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| struct HirIdValidator<'a, 'hir: 'a> { | ||
| hir_map: &'a hir::map::Map<'hir>, | ||
| owner_def_index: Option<DefIndex>, | ||
| hir_ids_seen: FxHashMap<ItemLocalId, NodeId>, | ||
| errors: Vec<String>, | ||
| } | ||
|
|
||
| struct OuterVisitor<'a, 'hir: 'a> { | ||
| hir_map: &'a hir::map::Map<'hir>, | ||
| errors: Vec<String>, | ||
| } | ||
|
|
||
| impl<'a, 'hir: 'a> OuterVisitor<'a, 'hir> { | ||
| fn new_inner_visitor(&self, | ||
| hir_map: &'a hir::map::Map<'hir>) | ||
| -> HirIdValidator<'a, 'hir> { | ||
| HirIdValidator { | ||
| hir_map: hir_map, | ||
| owner_def_index: None, | ||
| hir_ids_seen: FxHashMap(), | ||
| errors: Vec::new(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a, 'hir: 'a> ItemLikeVisitor<'hir> for OuterVisitor<'a, 'hir> { | ||
| fn visit_item(&mut self, i: &'hir hir::Item) { | ||
| let mut inner_visitor = self.new_inner_visitor(self.hir_map); | ||
| inner_visitor.check(i.id, |this| intravisit::walk_item(this, i)); | ||
| self.errors.extend(inner_visitor.errors.drain(..)); | ||
| } | ||
|
|
||
| fn visit_trait_item(&mut self, i: &'hir hir::TraitItem) { | ||
| let mut inner_visitor = self.new_inner_visitor(self.hir_map); | ||
| inner_visitor.check(i.id, |this| intravisit::walk_trait_item(this, i)); | ||
| self.errors.extend(inner_visitor.errors.drain(..)); | ||
| } | ||
|
|
||
| fn visit_impl_item(&mut self, i: &'hir hir::ImplItem) { | ||
| let mut inner_visitor = self.new_inner_visitor(self.hir_map); | ||
| inner_visitor.check(i.id, |this| intravisit::walk_impl_item(this, i)); | ||
| self.errors.extend(inner_visitor.errors.drain(..)); | ||
| } | ||
| } | ||
|
|
||
| impl<'a, 'hir: 'a> HirIdValidator<'a, 'hir> { | ||
|
|
||
| fn check<F: FnOnce(&mut HirIdValidator<'a, 'hir>)>(&mut self, | ||
| node_id: NodeId, | ||
| walk: F) { | ||
| assert!(self.owner_def_index.is_none()); | ||
| let owner_def_index = self.hir_map.local_def_id(node_id).index; | ||
| self.owner_def_index = Some(owner_def_index); | ||
| walk(self); | ||
|
|
||
| if owner_def_index == CRATE_DEF_INDEX { | ||
| return | ||
| } | ||
|
|
||
| // There's always at least one entry for the owning item itself | ||
| let max = self.hir_ids_seen | ||
| .keys() | ||
| .map(|local_id| local_id.as_usize()) | ||
| .max() | ||
| .unwrap(); | ||
|
|
||
| if max != self.hir_ids_seen.len() - 1 { | ||
| // Collect the missing ItemLocalIds | ||
| let missing: Vec<_> = (0 .. max + 1) | ||
| .filter(|&i| !self.hir_ids_seen.contains_key(&ItemLocalId(i as u32))) | ||
| .collect(); | ||
|
|
||
| // Try to map those to something more useful | ||
| let mut missing_items = vec![]; | ||
|
|
||
| for local_id in missing { | ||
| let hir_id = HirId { | ||
| owner: owner_def_index, | ||
| local_id: ItemLocalId(local_id as u32), | ||
| }; | ||
|
|
||
| // We are already in ICE mode here, so doing a linear search | ||
| // should be fine. | ||
| let (node_id, _) = self.hir_map | ||
| .definitions() | ||
| .node_to_hir_id | ||
| .iter() | ||
| .enumerate() | ||
| .find(|&(_, &entry)| hir_id == entry) | ||
| .unwrap(); | ||
| let node_id = NodeId::new(node_id); | ||
| missing_items.push(format!("[local_id: {}, node:{}]", | ||
| local_id, | ||
| self.hir_map.node_to_string(node_id))); | ||
| } | ||
|
|
||
| self.errors.push(format!( | ||
| "ItemLocalIds not assigned densely in {}. \ | ||
| Max ItemLocalId = {}, missing IDs = {:?}", | ||
| self.hir_map.def_path(DefId::local(owner_def_index)).to_string_no_crate(), | ||
| max, | ||
| missing_items)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a, 'hir: 'a> intravisit::Visitor<'hir> for HirIdValidator<'a, 'hir> { | ||
|
|
||
| fn nested_visit_map<'this>(&'this mut self) | ||
| -> intravisit::NestedVisitorMap<'this, 'hir> { | ||
| intravisit::NestedVisitorMap::OnlyBodies(self.hir_map) | ||
| } | ||
|
|
||
| fn visit_id(&mut self, node_id: NodeId) { | ||
| let owner = self.owner_def_index.unwrap(); | ||
| let stable_id = self.hir_map.definitions().node_to_hir_id[node_id]; | ||
|
|
||
| if stable_id == hir::DUMMY_HIR_ID { | ||
| self.errors.push(format!("HirIdValidator: No HirId assigned for NodeId {}: {:?}", | ||
| node_id, | ||
| self.hir_map.node_to_string(node_id))); | ||
| } | ||
|
|
||
| if owner != stable_id.owner { | ||
| self.errors.push(format!( | ||
| "HirIdValidator: The recorded owner of {} is {} instead of {}", | ||
| self.hir_map.node_to_string(node_id), | ||
| self.hir_map.def_path(DefId::local(stable_id.owner)).to_string_no_crate(), | ||
| self.hir_map.def_path(DefId::local(owner)).to_string_no_crate())); | ||
| } | ||
|
|
||
| if let Some(prev) = self.hir_ids_seen.insert(stable_id.local_id, node_id) { | ||
| if prev != node_id { | ||
| self.errors.push(format!( | ||
| "HirIdValidator: Same HirId {}/{} assigned for nodes {} and {}", | ||
| self.hir_map.def_path(DefId::local(stable_id.owner)).to_string_no_crate(), | ||
| stable_id.local_id.as_usize(), | ||
| self.hir_map.node_to_string(prev), | ||
| self.hir_map.node_to_string(node_id))); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn visit_impl_item_ref(&mut self, _: &'hir hir::ImplItemRef) { | ||
| // Explicitly do nothing here. ImplItemRefs contain hir::Visibility | ||
| // values that actually belong to an ImplItem instead of the ItemImpl | ||
| // we are currently in. So for those it's correct that they have a | ||
| // different owner. | ||
| } | ||
| } |
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
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
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
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hahahaha I think I remember when this changed due to syntactical elision.