nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-13 12:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clarify follow_inlining.

Browse Source 
I found this confusing because it includes the root item, plus the
inlined items reachable from the root item. The new formulation
separates the two parts more clearly.
This commit is contained in:
Nicholas Nethercote 2023-06-01 16:05:06 +10:00
parent 3806bad6cf
commit 4f800b56d0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_monomorphize/src/partitioning.rs
View File

@ -426,7 +426,10 @@ fn place_inlined_mono_items<'tcx>(
// Collect all items that need to be available in this codegen unit.
let mut reachable = FxHashSet::default();
for root in cgu.items().keys() {
follow_inlining(cx.tcx, *root, cx.usage_map, &mut reachable);
// Insert the root item itself, plus all inlined items that are
// reachable from it without going via another root item.
reachable.insert(*root);
get_reachable_inlined_items(cx.tcx, *root, cx.usage_map, &mut reachable);
}
// Add all monomorphizations that are not already there.
@ -462,18 +465,17 @@ fn place_inlined_mono_items<'tcx>(
return mono_item_placements;
fn follow_inlining<'tcx>(
fn get_reachable_inlined_items<'tcx>(
tcx: TyCtxt<'tcx>,
item: MonoItem<'tcx>,
usage_map: &UsageMap<'tcx>,
visited: &mut FxHashSet<MonoItem<'tcx>>,
) {
if !visited.insert(item) {
return;
}
usage_map.for_each_inlined_used_item(tcx, item, |inlined_item| {
follow_inlining(tcx, inlined_item, usage_map, visited);
let is_new = visited.insert(inlined_item);
if is_new {
get_reachable_inlined_items(tcx, inlined_item, usage_map, visited);
}
});
}
}