Skip to content
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

rustc_monomorphize cleanups #116875

Merged
merged 5 commits into from
Oct 20, 2023
Merged

rustc_monomorphize cleanups #116875

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
025eb20
Remove unneeded dependencies from `rustc_monomorphize`.
nnethercote Oct 18, 2023
42c8803
Remove empty `MirUsedCollector::visit_local`.
nnethercote Oct 18, 2023
55c5ab9
Inline and remove `item_requires_monomorphization`.
nnethercote Oct 18, 2023
4f92337
Streamline `build_skip_move_check_fns`.
nnethercote Oct 18, 2023
a145b49
Remove `UnknownPartitionStrategy` error.
nnethercote Oct 18, 2023
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
Prev Previous commit
Next Next commit
Inline and remove item_requires_monomorphization. 
It's very simple and has a single call site.
  • Loading branch information
@nnethercote
nnethercote committed Oct 18, 2023
commit 55c5ab9fbcdae47dbbae8014ecb7c62f78906dea
9 changes: 2 additions & 7 deletions compiler/rustc_monomorphize/src/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ use rustc_hir::lang_items::LangItem;
use rustc_middle::mir::interpret::{AllocId, ErrorHandled, GlobalAlloc, Scalar};
use rustc_middle::mir::mono::{InstantiationMode, MonoItem};
use rustc_middle::mir::visit::Visitor as MirVisitor;
use rustc_middle::mir::{self, Local, Location};
use rustc_middle::mir::{self, Location};
use rustc_middle::query::TyCtxtAt;
use rustc_middle::ty::adjustment::{CustomCoerceUnsized, PointerCoercion};
use rustc_middle::ty::print::with_no_trimmed_paths;
Expand Down Expand Up @@ -1212,7 +1212,7 @@ impl<'v> RootCollector<'_, 'v> {
}

fn is_root(&self, def_id: LocalDefId) -> bool {
!item_requires_monomorphization(self.tcx, def_id)
!self.tcx.generics_of(def_id).requires_monomorphization(self.tcx)
&& match self.mode {
MonoItemCollectionMode::Eager => true,
MonoItemCollectionMode::Lazy => {
Expand Down Expand Up @@ -1275,11 +1275,6 @@ impl<'v> RootCollector<'_, 'v> {
}
}

fn item_requires_monomorphization(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
let generics = tcx.generics_of(def_id);
generics.requires_monomorphization(tcx)
}

#[instrument(level = "debug", skip(tcx, output))]
fn create_mono_items_for_default_impls<'tcx>(
tcx: TyCtxt<'tcx>,
Expand Down