rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Avoid eagerly loading the hir fn sig

Browse Source
This commit is contained in:
Oli Scherer
2025-06-13 09:10:04 +00:00
parent 5940109a04
commit 70215dfe61
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_hir_analysis/src/check/wfcheck.rs
View File

@@ -328,16 +328,15 @@ fn check_trait_item<'tcx>(
) -> Result<(), ErrorGuaranteed> { ) -> Result<(), ErrorGuaranteed> {
let def_id = trait_item.owner_id.def_id; let def_id = trait_item.owner_id.def_id;
let (method_sig, span) = match trait_item.kind { let span = match trait_item.kind {
hir::TraitItemKind::Fn(ref sig, _) => (Some(sig), trait_item.span), hir::TraitItemKind::Type(_bounds, Some(ty)) => ty.span,
hir::TraitItemKind::Type(_bounds, Some(ty)) => (None, ty.span), _ => trait_item.span,
_ => (None, trait_item.span),
}; };
// Check that an item definition in a subtrait is shadowing a supertrait item. // Check that an item definition in a subtrait is shadowing a supertrait item.
lint_item_shadowing_supertrait_item(tcx, def_id); lint_item_shadowing_supertrait_item(tcx, def_id);
let mut res = check_associated_item(tcx, def_id, span, method_sig); let mut res = check_associated_item(tcx, def_id, span);
if matches!(trait_item.kind, hir::TraitItemKind::Fn(..)) { if matches!(trait_item.kind, hir::TraitItemKind::Fn(..)) {
for &assoc_ty_def_id in tcx.associated_types_for_impl_traits_in_associated_fn(def_id) { for &assoc_ty_def_id in tcx.associated_types_for_impl_traits_in_associated_fn(def_id) {
@@ -345,7 +344,6 @@ fn check_trait_item<'tcx>(
tcx, tcx,
assoc_ty_def_id.expect_local(), assoc_ty_def_id.expect_local(),
tcx.def_span(assoc_ty_def_id), tcx.def_span(assoc_ty_def_id),
None,
)); ));
} }
} }
@@ -829,13 +827,12 @@ fn check_impl_item<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
impl_item: &'tcx hir::ImplItem<'tcx>, impl_item: &'tcx hir::ImplItem<'tcx>,
) -> Result<(), ErrorGuaranteed> { ) -> Result<(), ErrorGuaranteed> {
let (method_sig, span) = match impl_item.kind { let span = match impl_item.kind {
hir::ImplItemKind::Fn(ref sig, _) => (Some(sig), impl_item.span),
// Constrain binding and overflow error spans to `<Ty>` in `type foo = <Ty>`. // Constrain binding and overflow error spans to `<Ty>` in `type foo = <Ty>`.
hir::ImplItemKind::Type(ty) if ty.span != DUMMY_SP => (None, ty.span), hir::ImplItemKind::Type(ty) if ty.span != DUMMY_SP => ty.span,
_ => (None, impl_item.span), _ => impl_item.span,
}; };
check_associated_item(tcx, impl_item.owner_id.def_id, span, method_sig) check_associated_item(tcx, impl_item.owner_id.def_id, span)
} }
fn check_param_wf(tcx: TyCtxt<'_>, param: &ty::GenericParamDef) -> Result<(), ErrorGuaranteed> { fn check_param_wf(tcx: TyCtxt<'_>, param: &ty::GenericParamDef) -> Result<(), ErrorGuaranteed> {
@@ -963,12 +960,11 @@ fn check_param_wf(tcx: TyCtxt<'_>, param: &ty::GenericParamDef) -> Result<(), Er
} }
} }
#[instrument(level = "debug", skip(tcx, span, sig_if_method))] #[instrument(level = "debug", skip(tcx, span))]
fn check_associated_item( fn check_associated_item(
tcx: TyCtxt<'_>, tcx: TyCtxt<'_>,
item_id: LocalDefId, item_id: LocalDefId,
span: Span, span: Span,
sig_if_method: Option<&hir::FnSig<'_>>,
) -> Result<(), ErrorGuaranteed> { ) -> Result<(), ErrorGuaranteed> {
let loc = Some(WellFormedLoc::Ty(item_id)); let loc = Some(WellFormedLoc::Ty(item_id));
enter_wf_checking_ctxt(tcx, item_id, |wfcx| { enter_wf_checking_ctxt(tcx, item_id, |wfcx| {
@@ -1002,7 +998,8 @@ fn check_associated_item(
} }
ty::AssocKind::Fn { .. } => { ty::AssocKind::Fn { .. } => {
let sig = tcx.fn_sig(item.def_id).instantiate_identity(); let sig = tcx.fn_sig(item.def_id).instantiate_identity();
let hir_sig = sig_if_method.expect("bad signature for method"); let hir_sig =
tcx.hir_node_by_def_id(item_id).fn_sig().expect("bad signature for method");
check_fn_or_method(wfcx, sig, hir_sig.decl, item.def_id.expect_local()); check_fn_or_method(wfcx, sig, hir_sig.decl, item.def_id.expect_local());
check_method_receiver(wfcx, hir_sig, item, self_ty) check_method_receiver(wfcx, hir_sig, item, self_ty)
} }