bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Don't reinvoke trait_header query twice

Browse source
This commit is contained in:
Oli Scherer 2024-02-13 09:38:13 +00:00
parent 55bbb054c9
commit 40b3cb0eb1
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_hir_analysis/src/coherence/builtin.rs
View file

@ -25,10 +25,11 @@ use rustc_trait_selection::traits::ObligationCtxt;
use rustc_trait_selection::traits::{self, ObligationCause}; use rustc_trait_selection::traits::{self, ObligationCause};
use std::collections::BTreeMap; use std::collections::BTreeMap;
pub fn check_trait( pub fn check_trait<'tcx>(
tcx: TyCtxt<'_>, tcx: TyCtxt<'tcx>,
trait_def_id: DefId, trait_def_id: DefId,
impl_def_id: LocalDefId, impl_def_id: LocalDefId,
impl_header: ty::ImplTraitHeader<'tcx>,
) -> Result<(), ErrorGuaranteed> { ) -> Result<(), ErrorGuaranteed> {
let lang_items = tcx.lang_items(); let lang_items = tcx.lang_items();
let checker = Checker { tcx, trait_def_id, impl_def_id }; let checker = Checker { tcx, trait_def_id, impl_def_id };
@ -40,10 +41,9 @@ pub fn check_trait(
res = res.and( res = res.and(
checker.check(lang_items.coerce_unsized_trait(), visit_implementation_of_coerce_unsized), checker.check(lang_items.coerce_unsized_trait(), visit_implementation_of_coerce_unsized),
); );
res.and( res.and(checker.check(lang_items.dispatch_from_dyn_trait(), |tcx, id| {
checker visit_implementation_of_dispatch_from_dyn(tcx, id, impl_header.trait_ref)
.check(lang_items.dispatch_from_dyn_trait(), visit_implementation_of_dispatch_from_dyn), }))
)
} }
struct Checker<'tcx> { struct Checker<'tcx> {
@ -151,9 +151,10 @@ fn visit_implementation_of_coerce_unsized(
tcx.at(span).ensure().coerce_unsized_info(impl_did) tcx.at(span).ensure().coerce_unsized_info(impl_did)
} }
fn visit_implementation_of_dispatch_from_dyn( fn visit_implementation_of_dispatch_from_dyn<'tcx>(
tcx: TyCtxt<'_>, tcx: TyCtxt<'tcx>,
impl_did: LocalDefId, impl_did: LocalDefId,
trait_ref: ty::TraitRef<'tcx>,
) -> Result<(), ErrorGuaranteed> { ) -> Result<(), ErrorGuaranteed> {
debug!("visit_implementation_of_dispatch_from_dyn: impl_did={:?}", impl_did); debug!("visit_implementation_of_dispatch_from_dyn: impl_did={:?}", impl_did);
@ -161,10 +162,9 @@ fn visit_implementation_of_dispatch_from_dyn(
let dispatch_from_dyn_trait = tcx.require_lang_item(LangItem::DispatchFromDyn, Some(span)); let dispatch_from_dyn_trait = tcx.require_lang_item(LangItem::DispatchFromDyn, Some(span));
let source = tcx.type_of(impl_did).instantiate_identity(); let source = trait_ref.self_ty();
assert!(!source.has_escaping_bound_vars()); assert!(!source.has_escaping_bound_vars());
let target = { let target = {
let trait_ref = tcx.impl_trait_ref(impl_did).unwrap().instantiate_identity();
assert_eq!(trait_ref.def_id, dispatch_from_dyn_trait); assert_eq!(trait_ref.def_id, dispatch_from_dyn_trait);
trait_ref.args.type_at(1) trait_ref.args.type_at(1)

2
compiler/rustc_hir_analysis/src/coherence/mod.rs
View file

@ -142,7 +142,7 @@ fn coherent_trait(tcx: TyCtxt<'_>, def_id: DefId) -> Result<(), ErrorGuaranteed>
res = res.and(unsafety::check_item(tcx, impl_def_id, trait_header, trait_def)); res = res.and(unsafety::check_item(tcx, impl_def_id, trait_header, trait_def));
res = res.and(tcx.ensure().orphan_check_impl(impl_def_id)); res = res.and(tcx.ensure().orphan_check_impl(impl_def_id));
res = res.and(builtin::check_trait(tcx, def_id, impl_def_id)); res = res.and(builtin::check_trait(tcx, def_id, impl_def_id, trait_header));
} }
res res