bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Only walk local items instead of filtering for them later

Browse source
This commit is contained in:
Oli Scherer 2025-04-01 10:06:27 +00:00
parent 798987982c
commit 49c74d29fd
2 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

34
compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
View file

@ -1730,25 +1730,23 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
.is_accessible_from(self.item_def_id(), tcx) .is_accessible_from(self.item_def_id(), tcx)
&& tcx.all_impls(*trait_def_id) && tcx.all_impls(*trait_def_id)
.any(|impl_def_id| { .any(|impl_def_id| {
let impl_header = tcx.impl_trait_header(impl_def_id); let header = tcx.impl_trait_header(impl_def_id).unwrap();
impl_header.is_some_and(|header| { let trait_ref = header.trait_ref.instantiate(
let trait_ref = header.trait_ref.instantiate( tcx,
tcx, infcx.fresh_args_for_item(DUMMY_SP, impl_def_id),
infcx.fresh_args_for_item(DUMMY_SP, impl_def_id), );
);
let value = fold_regions(tcx, qself_ty, |_, _| tcx.lifetimes.re_erased); let value = fold_regions(tcx, qself_ty, |_, _| tcx.lifetimes.re_erased);
// FIXME: Don't bother dealing with non-lifetime binders here... // FIXME: Don't bother dealing with non-lifetime binders here...
if value.has_escaping_bound_vars() { if value.has_escaping_bound_vars() {
return false; return false;
} }
infcx infcx
.can_eq( .can_eq(
ty::ParamEnv::empty(), ty::ParamEnv::empty(),
trait_ref.self_ty(), trait_ref.self_ty(),
value, value,
) && header.polarity != ty::ImplPolarity::Negative ) && header.polarity != ty::ImplPolarity::Negative
})
}) })
}) })
.map(|trait_def_id| tcx.def_path_str(trait_def_id)) .map(|trait_def_id| tcx.def_path_str(trait_def_id))

6
compiler/rustc_passes/src/dead.rs
View file

@ -421,10 +421,8 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
} }
hir::ItemKind::ForeignMod { .. } => {} hir::ItemKind::ForeignMod { .. } => {}
hir::ItemKind::Trait(..) => { hir::ItemKind::Trait(..) => {
for impl_def_id in self.tcx.all_impls(item.owner_id.to_def_id()) { for &impl_def_id in self.tcx.local_trait_impls(item.owner_id.def_id) {
if let Some(local_def_id) = impl_def_id.as_local() if let ItemKind::Impl(impl_ref) = self.tcx.hir_expect_item(impl_def_id).kind
&& let ItemKind::Impl(impl_ref) =
self.tcx.hir_expect_item(local_def_id).kind
{ {
// skip items // skip items
// mark dependent traits live // mark dependent traits live