Skip to content

Don't do expensive HIR walk to collect nested bodies #141057

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Don't do expensive HIR walk to collect nested bodies #141057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions compiler/rustc_ty_utils/src/nested_bodies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,22 @@
use rustc_hir as hir;
use rustc_hir::def_id::{DefId, LocalDefId};
use rustc_hir::intravisit::Visitor;
use rustc_hir::def_id::LocalDefId;
use rustc_middle::query::Providers;
use rustc_middle::ty::{self, TyCtxt};

fn nested_bodies_within<'tcx>(tcx: TyCtxt<'tcx>, item: LocalDefId) -> &'tcx ty::List<LocalDefId> {
let body = tcx.hir_body_owned_by(item);
let mut collector =
NestedBodiesVisitor { tcx, root_def_id: item.to_def_id(), nested_bodies: vec![] };
collector.visit_body(body);
tcx.mk_local_def_ids(&collector.nested_bodies)
}

struct NestedBodiesVisitor<'tcx> {
tcx: TyCtxt<'tcx>,
root_def_id: DefId,
nested_bodies: Vec<LocalDefId>,
}

impl<'tcx> Visitor<'tcx> for NestedBodiesVisitor<'tcx> {
fn visit_nested_body(&mut self, id: hir::BodyId) {
let body_def_id = self.tcx.hir_body_owner_def_id(id);
if self.tcx.typeck_root_def_id(body_def_id.to_def_id()) == self.root_def_id {
self.nested_bodies.push(body_def_id);
let body = self.tcx.hir_body(id);
self.visit_body(body);
}
}
let owner = tcx.local_def_id_to_hir_id(item).owner;
let children = tcx.mk_local_def_ids_from_iter(
tcx.hir_owner_nodes(owner)
.bodies
.iter()
.map(|&(_, body)| tcx.hir_body_owner_def_id(body.id()))
.filter(|&child_item| {
// Anon consts are not owner IDs, but they may have (e.g.) closures in them.
// Filter this just down to bodies that share the typeck root.
child_item != item
&& tcx.typeck_root_def_id(child_item.to_def_id()).expect_local() == item
}),
);
children
}

pub(super) fn provide(providers: &mut Providers) {
Expand Down
Loading