bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Verify that HIR parenting and Def parenting match.

Browse source
This commit is contained in:
Camille GILLOT 2022-11-26 17:22:10 +00:00
parent 1dda298ad3
commit b22418eac3
3 changed files with 54 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_middle/src/hir/mod.rs
View file

@ -133,13 +133,8 @@ pub fn provide(providers: &mut Providers) {
// Accessing the local_parent is ok since its value is hashed as part of `id`'s DefPathHash.
tcx.opt_local_parent(id.def_id).map_or(CRATE_HIR_ID, |parent| {
let mut parent_hir_id = tcx.hir().local_def_id_to_hir_id(parent);
if let Some(local_id) = tcx.hir_crate(()).owners[parent_hir_id.owner.def_id]
.unwrap()
.parenting
.get(&id.def_id)
{
parent_hir_id.local_id = *local_id;
}
parent_hir_id.local_id =
tcx.hir_crate(()).owners[parent_hir_id.owner.def_id].unwrap().parenting[&id.def_id];
parent_hir_id
})
};