nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

collector: move ensure_sufficient_stack out of the loop

Browse Source
This commit is contained in:
Ralf Jung 2024-03-17 09:56:58 +01:00
parent 72d78970ec
commit ee746fb8ed
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_monomorphize/src/collector.rs
View File

@ -1433,7 +1433,7 @@ fn create_mono_items_for_default_impls<'tcx>(
} }
} }
/// Scans the CTFE alloc in order to find function calls, closures, and drop-glue. /// Scans the CTFE alloc in order to find function pointers and statics that must be monomorphized.
fn collect_alloc<'tcx>(tcx: TyCtxt<'tcx>, alloc_id: AllocId, output: &mut MonoItems<'tcx>) { fn collect_alloc<'tcx>(tcx: TyCtxt<'tcx>, alloc_id: AllocId, output: &mut MonoItems<'tcx>) {
match tcx.global_alloc(alloc_id) { match tcx.global_alloc(alloc_id) {
GlobalAlloc::Static(def_id) => { GlobalAlloc::Static(def_id) => {
@ -1446,9 +1446,13 @@ fn collect_alloc<'tcx>(tcx: TyCtxt<'tcx>, alloc_id: AllocId, output: &mut MonoIt
} }
GlobalAlloc::Memory(alloc) => { GlobalAlloc::Memory(alloc) => {
trace!("collecting {:?} with {:#?}", alloc_id, alloc); trace!("collecting {:?} with {:#?}", alloc_id, alloc);
for &prov in alloc.inner().provenance().ptrs().values() { let ptrs = alloc.inner().provenance().ptrs();
rustc_data_structures::stack::ensure_sufficient_stack(|| { // avoid `ensure_sufficient_stack` in the common case of "no pointers"
collect_alloc(tcx, prov.alloc_id(), output); if !ptrs.is_empty() {
rustc_data_structures::stack::ensure_sufficient_stack(move || {
for &prov in ptrs.values() {
collect_alloc(tcx, prov.alloc_id(), output);
}
}); });
} }
} }