Auto merge of #143783 - bvanjoi:issue-143697-2, r=<try>

compute all rpitit of a trait

Fixes #143697

r? `@compiler-errors`

Author: rust-bors[bot]

compiler/rustc_middle/src/query/mod.rs

@@ -1091,6 +1091,12 @@ rustc_queries! {
         separate_provide_extern
     }
 
+    query associated_types_for_impl_traits_in_trait(trait_id: DefId) -> &'tcx DefIdMap<&'tcx [DefId]> {
+        arena_cache
+        desc { |tcx| "creating associated items for trait `{}`", tcx.def_path_str(trait_id) }
+        separate_provide_extern
+    }
+
     /// Given an `impl_id`, return the trait it implements along with some header information.
     /// Return `None` if this is an inherent impl.
     query impl_trait_header(impl_id: DefId) -> Option<ty::ImplTraitHeader<'tcx>> {

compiler/rustc_ty_utils/src/assoc.rs

@@ -1,3 +1,6 @@
+use std::collections::hash_map::Entry;
+
+use rustc_data_structures::fx::FxHashMap;
 use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{DefId, DefIdMap, LocalDefId};
@@ -6,12 +9,14 @@ use rustc_hir::intravisit::{self, Visitor};
 use rustc_middle::query::Providers;
 use rustc_middle::ty::{self, ImplTraitInTraitData, TyCtxt};
 use rustc_middle::{bug, span_bug};
+use rustc_span::Symbol;
 
 pub(crate) fn provide(providers: &mut Providers) {
     *providers = Providers {
         associated_item,
         associated_item_def_ids,
         associated_items,
+        associated_types_for_impl_traits_in_trait,
         associated_types_for_impl_traits_in_associated_fn,
         impl_item_implementor_ids,
         ..*providers
@@ -163,10 +168,12 @@ struct RPITVisitor<'tcx> {
     synthetics: Vec<LocalDefId>,
     data: DefPathData,
     disambiguator: DisambiguatorState,
+    depth: u32,
 }
 
 impl<'tcx> Visitor<'tcx> for RPITVisitor<'tcx> {
     fn visit_opaque_ty(&mut self, opaque: &'tcx hir::OpaqueTy<'tcx>) -> Self::Result {
+        self.depth += 1;
         self.synthetics.push(associated_type_for_impl_trait_in_trait(
             self.tcx,
             opaque.def_id,
@@ -177,17 +184,6 @@ impl<'tcx> Visitor<'tcx> for RPITVisitor<'tcx> {
     }
 }
 
-struct DisambiguatorIdxVisitor {
-    depth: u32,
-}
-
-impl<'tcx> Visitor<'tcx> for DisambiguatorIdxVisitor {
-    fn visit_opaque_ty(&mut self, opaque: &'tcx hir::OpaqueTy<'tcx>) -> Self::Result {
-        self.depth += 1;
-        intravisit::walk_opaque_ty(self, opaque)
-    }
-}
-
 /// Given an `fn_def_id` of a trait or a trait implementation:
 ///
 /// if `fn_def_id` is a function defined inside a trait, then it synthesizes
@@ -205,51 +201,7 @@ fn associated_types_for_impl_traits_in_associated_fn(
 
     match tcx.def_kind(parent_def_id) {
         DefKind::Trait => {
-            if let Some(output) = tcx.hir_get_fn_output(fn_def_id) {
-                let def_path_id = |def_id: LocalDefId| tcx.item_name(def_id.to_def_id());
-                let def_path_data = def_path_id(fn_def_id);
-
-                let (.., trait_item_refs) = tcx.hir_expect_item(parent_def_id).expect_trait();
-                // The purpose of `disambiguator_idx` is to ensure there are
-                // no duplicate `def_id` in certain cases, such as:
-                // ```
-                // trait Foo {
-                //     fn bar() -> impl Trait;
-                //     fn bar() -> impl Trait;
-                //              // ~~~~~~~~~~ It will generate the same ID if we don’t disambiguate it.
-                // }
-                // ```
-                let disambiguator_idx = trait_item_refs
-                    .iter()
-                    .take_while(|item| item.id.owner_id.def_id != fn_def_id)
-                    .filter(|item| {
-                        matches!(item.kind, hir::AssocItemKind::Fn { .. })
-                            && def_path_id(item.id.owner_id.def_id) == def_path_data
-                    })
-                    .last()
-                    .map(|item| {
-                        let output = tcx.hir_get_fn_output(item.id.owner_id.def_id).unwrap();
-                        let mut visitor = DisambiguatorIdxVisitor { depth: 0 };
-                        visitor.visit_fn_ret_ty(output);
-                        tcx.def_key(item.id.owner_id.def_id).disambiguated_data.disambiguator
-                            + visitor.depth
-                    })
-                    .unwrap_or_default();
-
-                let data = DefPathData::AnonAssocTy(def_path_data);
-                let mut visitor = RPITVisitor {
-                    tcx,
-                    synthetics: vec![],
-                    data,
-                    disambiguator: DisambiguatorState::with(parent_def_id, data, disambiguator_idx),
-                };
-                visitor.visit_fn_ret_ty(output);
-                tcx.arena.alloc_from_iter(
-                    visitor.synthetics.into_iter().map(|def_id| def_id.to_def_id()),
-                )
-            } else {
-                &[]
-            }
+            tcx.associated_types_for_impl_traits_in_trait(parent_def_id)[&fn_def_id.to_def_id()]
         }
 
         DefKind::Impl { .. } => {
@@ -274,6 +226,54 @@ fn associated_types_for_impl_traits_in_associated_fn(
     }
 }
 
+fn associated_types_for_impl_traits_in_trait<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_id: LocalDefId,
+) -> DefIdMap<&'tcx [DefId]> {
+    let (.., trait_item_refs) = tcx.hir_expect_item(trait_id).expect_trait();
+
+    let mut disambiguator_idx_map = FxHashMap::default();
+    let find_disambiguator_idx = |map: &mut FxHashMap<Symbol, u32>, name| match map.entry(name) {
+        Entry::Occupied(occ) => *occ.get() + 1,
+        Entry::Vacant(vac) => {
+            vac.insert(0);
+            0
+        }
+    };
+    let update_disambiguator_idx = |map: &mut FxHashMap<Symbol, u32>, name, offset: u32| {
+        *map.get_mut(&name).unwrap() += offset
+    };
+
+    trait_item_refs
+        .iter()
+        .filter_map(move |item| {
+            if !matches!(item.kind, hir::AssocItemKind::Fn { .. }) {
+                return None;
+            }
+            let fn_def_id = item.id.owner_id.def_id;
+            let Some(output) = tcx.hir_get_fn_output(fn_def_id) else {
+                return Some((fn_def_id.to_def_id(), &[] as &[DefId]));
+            };
+            let def_name = tcx.item_name(fn_def_id.to_def_id());
+            let disambiguator_idx = find_disambiguator_idx(&mut disambiguator_idx_map, def_name);
+            let data = DefPathData::AnonAssocTy(def_name);
+            let mut visitor = RPITVisitor {
+                tcx,
+                synthetics: vec![],
+                data,
+                depth: 0,
+                disambiguator: DisambiguatorState::with(trait_id, data, disambiguator_idx),
+            };
+            visitor.visit_fn_ret_ty(output);
+            update_disambiguator_idx(&mut disambiguator_idx_map, def_name, visitor.depth);
+            let defs = tcx
+                .arena
+                .alloc_from_iter(visitor.synthetics.into_iter().map(|def_id| def_id.to_def_id()));
+            Some((fn_def_id.to_def_id(), defs))
+        })
+        .collect()
+}
+
 /// Given an `opaque_ty_def_id` corresponding to an `impl Trait` in an associated
 /// function from a trait, synthesize an associated type for that `impl Trait`
 /// that inherits properties that we infer from the method and the opaque type.

tests/ui/impl-trait/in-trait/rpitit-duplicate-associated-fn-with-nested.rs

@@ -43,4 +43,17 @@ trait Qux {
     //~^^^^ ERROR: the name `foo` is defined multiple times
 }
 
+trait T0<T> {
+    type Target;
+}
+trait T1<T> {}
+
+trait X {
+    fn a() -> impl T0<(), Target = impl T1<()>>;
+    fn a() -> impl T0<(), Target = impl T1<()>>;
+    //~^ ERROR the name `a` is defined multiple times
+    fn a() -> impl T0<(), Target = impl T1<()>>;
+    //~^ ERROR the name `a` is defined multiple times
+}
+
 fn main() {}

tests/ui/impl-trait/in-trait/rpitit-duplicate-associated-fn-with-nested.stderr

@@ -44,6 +44,27 @@ LL | |         >;
    |
    = note: `foo` must be defined only once in the value namespace of this trait
 
-error: aborting due to 4 previous errors
+error[E0428]: the name `a` is defined multiple times
+  --> $DIR/rpitit-duplicate-associated-fn-with-nested.rs:53:5
+   |
+LL |     fn a() -> impl T0<(), Target = impl T1<()>>;
+   |     -------------------------------------------- previous definition of the value `a` here
+LL |     fn a() -> impl T0<(), Target = impl T1<()>>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `a` redefined here
+   |
+   = note: `a` must be defined only once in the value namespace of this trait
+
+error[E0428]: the name `a` is defined multiple times
+  --> $DIR/rpitit-duplicate-associated-fn-with-nested.rs:55:5
+   |
+LL |     fn a() -> impl T0<(), Target = impl T1<()>>;
+   |     -------------------------------------------- previous definition of the value `a` here
+...
+LL |     fn a() -> impl T0<(), Target = impl T1<()>>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `a` redefined here
+   |
+   = note: `a` must be defined only once in the value namespace of this trait
+
+error: aborting due to 6 previous errors
 
 For more information about this error, try `rustc --explain E0428`.