JonathanBrouwer
diff --git a/‎src/doc/rustdoc/src/unstable-features.md‎
Lines changed: 9 additions & 0 deletions b/‎src/doc/rustdoc/src/unstable-features.md‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎src/librustdoc/html/render/span_map.rs‎
Lines changed: 114 additions & 99 deletions b/‎src/librustdoc/html/render/span_map.rs‎
Lines changed: 114 additions & 99 deletions
diff --git a/‎tests/rustdoc-html/jump-to-def/assoc-items-extra.rs‎
Lines changed: 20 additions & 0 deletions b/‎tests/rustdoc-html/jump-to-def/assoc-items-extra.rs‎
Lines changed: 20 additions & 0 deletions
@@ -653,6 +653,15 @@ add the `--scrape-tests` flag.
 This flag enables the generation of links in the source code pages which allow the reader
 to jump to a type definition.
 
+> [!WARNING]
+> In very specific scenarios, enabling this feature may lead to your program getting rejected if you
+> rely on rustdoc intentionally not running all semantic analysis passes on function bodies to aid
+> with documenting `cfg`-conditional items.
+>
+> More concretely, rustdoc may choose to type-check bodies if they contain type-dependent paths
+> including method calls. This may result in name resolution and type errors getting reported that
+> rustdoc would usually suppress.
+
 ### `--test-builder`: `rustc`-like program to build tests
 
  * Tracking issue: [#102981](https://github.com/rust-lang/rust/issues/102981)
 
@@ -1,12 +1,13 @@
 use std::path::{Path, PathBuf};
 
 use rustc_data_structures::fx::{FxHashMap, FxIndexMap};
+use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
-use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId};
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_hir::intravisit::{self, Visitor, VisitorExt};
 use rustc_hir::{ExprKind, HirId, Item, ItemKind, Mod, Node, QPath};
 use rustc_middle::hir::nested_filter;
-use rustc_middle::ty::TyCtxt;
+use rustc_middle::ty::{self, TyCtxt};
 use rustc_span::{BytePos, ExpnKind};
 
 use crate::clean::{self, PrimitiveType, rustc_span};
@@ -82,7 +83,8 @@ pub(crate) fn collect_spans_and_sources(
     generate_link_to_definition: bool,
 ) -> (FxIndexMap<PathBuf, String>, FxHashMap<Span, LinkFromSrc>) {
     if include_sources {
-        let mut visitor = SpanMapVisitor { tcx, matches: FxHashMap::default() };
+        let mut visitor =
+            SpanMapVisitor { tcx, maybe_typeck_results: None, matches: FxHashMap::default() };
 
         if generate_link_to_definition {
             tcx.hir_walk_toplevel_module(&mut visitor);
@@ -96,49 +98,63 @@ pub(crate) fn collect_spans_and_sources(
 
 struct SpanMapVisitor<'tcx> {
     pub(crate) tcx: TyCtxt<'tcx>,
+    pub(crate) maybe_typeck_results: Option<LazyTypeckResults<'tcx>>,
     pub(crate) matches: FxHashMap<Span, LinkFromSrc>,
 }
 
-impl SpanMapVisitor<'_> {
+impl<'tcx> SpanMapVisitor<'tcx> {
+    /// Returns the typeck results of the current body if we're in one.
+    ///
+    /// This will typeck the body if it hasn't been already. Since rustdoc intentionally doesn't run
+    /// all semantic analysis passes on function bodies at the time of writing, this can lead to us
+    /// "suddenly" rejecting the user's code under `--generate-link-to-definition` while accepting
+    /// it if that flag isn't passed! So use this method sparingly and think about the consequences
+    /// including performance!
+    ///
+    /// This behavior is documented in the rustdoc book. Ideally, it wouldn't be that way but no
+    /// good solution has been found so far. Don't think about adding some sort of flag to rustc to
+    /// suppress diagnostic emission that would be unsound wrt. `ErrorGuaranteed`[^1] and generally
+    /// be quite hacky!
+    ///
+    /// [^1]: Historical context:
+    /// <https://github.com/rust-lang/rust/issues/69426#issuecomment-1019412352>.
+    fn maybe_typeck_results(&mut self) -> Option<&'tcx ty::TypeckResults<'tcx>> {
+        let results = self.maybe_typeck_results.as_mut()?;
+        let results = results.cache.get_or_insert_with(|| self.tcx.typeck_body(results.body_id));
+        Some(results)
+    }
+
+    fn link_for_def(&self, def_id: DefId) -> LinkFromSrc {
+        if def_id.is_local() {
+            LinkFromSrc::Local(rustc_span(def_id, self.tcx))
+        } else {
+            LinkFromSrc::External(def_id)
+        }
+    }
+
     /// This function is where we handle `hir::Path` elements and add them into the "span map".
-    fn handle_path(&mut self, path: &rustc_hir::Path<'_>, only_use_last_segment: bool) {
+    fn handle_path(&mut self, path: &hir::Path<'_>, only_use_last_segment: bool) {
         match path.res {
-            // FIXME: For now, we handle `DefKind` if it's not a `DefKind::TyParam`.
-            // Would be nice to support them too alongside the other `DefKind`
-            // (such as primitive types!).
-            Res::Def(kind, def_id) if kind != DefKind::TyParam => {
-                let link = if def_id.as_local().is_some() {
-                    LinkFromSrc::Local(rustc_span(def_id, self.tcx))
-                } else {
-                    LinkFromSrc::External(def_id)
-                };
+            // FIXME: Properly support type parameters. Note they resolve just fine. The issue is
+            // that our highlighter would then also linkify their *definition site* for some reason
+            // linking them to themselves. Const parameters don't exhibit this issue.
+            Res::Def(DefKind::TyParam, _) => {}
+            Res::Def(_, def_id) => {
+                // The segments can be empty for `use *;` in a non-crate-root scope in Rust 2015.
+                let span = path.segments.last().map_or(path.span, |seg| seg.ident.span);
                 // In case the path ends with generics, we remove them from the span.
-                let span = if only_use_last_segment
-                    && let Some(path_span) = path.segments.last().map(|segment| segment.ident.span)
-                {
-                    path_span
+                let span = if only_use_last_segment {
+                    span
                 } else {
-                    path.segments
-                        .last()
-                        .map(|last| {
-                            // In `use` statements, the included item is not in the path segments.
-                            // However, it doesn't matter because you can't have generics on `use`
-                            // statements.
-                            if path.span.contains(last.ident.span) {
-                                path.span.with_hi(last.ident.span.hi())
-                            } else {
-                                path.span
-                            }
-                        })
-                        .unwrap_or(path.span)
+                    // In `use` statements, the included item is not in the path segments. However,
+                    // it doesn't matter because you can't have generics on `use` statements.
+                    if path.span.contains(span) { path.span.with_hi(span.hi()) } else { path.span }
                 };
-                self.matches.insert(span.into(), link);
+                self.matches.insert(span.into(), self.link_for_def(def_id));
             }
             Res::Local(_) if let Some(span) = self.tcx.hir_res_span(path.res) => {
-                let path_span = if only_use_last_segment
-                    && let Some(path_span) = path.segments.last().map(|segment| segment.ident.span)
-                {
-                    path_span
+                let path_span = if only_use_last_segment {
+                    path.segments.last().unwrap().ident.span
                 } else {
                     path.span
                 };
@@ -149,7 +165,6 @@ impl SpanMapVisitor<'_> {
                 self.matches
                     .insert(path.span.into(), LinkFromSrc::Primitive(PrimitiveType::from(p)));
             }
-            Res::Err => {}
             _ => {}
         }
     }
@@ -216,43 +231,6 @@ impl SpanMapVisitor<'_> {
         self.matches.insert(new_span.into(), link_from_src);
         true
     }
-
-    fn infer_id(&mut self, hir_id: HirId, expr_hir_id: Option<HirId>, span: Span) {
-        let tcx = self.tcx;
-        let body_id = tcx.hir_enclosing_body_owner(hir_id);
-        // FIXME: this is showing error messages for parts of the code that are not
-        // compiled (because of cfg)!
-        //
-        // See discussion in https://github.com/rust-lang/rust/issues/69426#issuecomment-1019412352
-        let typeck_results = tcx.typeck_body(tcx.hir_body_owned_by(body_id).id());
-        // Interestingly enough, for method calls, we need the whole expression whereas for static
-        // method/function calls, we need the call expression specifically.
-        if let Some(def_id) = typeck_results.type_dependent_def_id(expr_hir_id.unwrap_or(hir_id)) {
-            let link = if def_id.as_local().is_some() {
-                LinkFromSrc::Local(rustc_span(def_id, tcx))
-            } else {
-                LinkFromSrc::External(def_id)
-            };
-            self.matches.insert(span, link);
-        }
-    }
-}
-
-// This is a reimplementation of `hir_enclosing_body_owner` which allows to fail without
-// panicking.
-fn hir_enclosing_body_owner(tcx: TyCtxt<'_>, hir_id: HirId) -> Option<LocalDefId> {
-    for (_, node) in tcx.hir_parent_iter(hir_id) {
-        // FIXME: associated type impl items don't have an associated body, so we don't handle
-        // them currently.
-        if let Node::ImplItem(impl_item) = node
-            && matches!(impl_item.kind, rustc_hir::ImplItemKind::Type(_))
-        {
-            return None;
-        } else if let Some((def_id, _)) = node.associated_body() {
-            return Some(def_id);
-        }
-    }
-    None
 }
 
 impl<'tcx> Visitor<'tcx> for SpanMapVisitor<'tcx> {
@@ -262,7 +240,24 @@ impl<'tcx> Visitor<'tcx> for SpanMapVisitor<'tcx> {
         self.tcx
     }
 
-    fn visit_path(&mut self, path: &rustc_hir::Path<'tcx>, _id: HirId) {
+    fn visit_nested_body(&mut self, body_id: hir::BodyId) -> Self::Result {
+        let maybe_typeck_results =
+            self.maybe_typeck_results.replace(LazyTypeckResults { body_id, cache: None });
+        self.visit_body(self.tcx.hir_body(body_id));
+        self.maybe_typeck_results = maybe_typeck_results;
+    }
+
+    fn visit_anon_const(&mut self, ct: &'tcx hir::AnonConst) {
+        // FIXME: Typeck'ing anon consts leads to ICEs in rustc if the parent body wasn't typeck'ed
+        //        yet. See #156418. Figure out what the best and proper solution for this is. Until
+        //        then, let's prevent `typeck` from being called on anon consts by not setting
+        //        `maybe_typeck_results` to `Some(_)`.
+        let maybe_typeck_results = self.maybe_typeck_results.take();
+        self.visit_body(self.tcx.hir_body(ct.body));
+        self.maybe_typeck_results = maybe_typeck_results;
+    }
+
+    fn visit_path(&mut self, path: &hir::Path<'tcx>, _id: HirId) {
         if self.handle_macro(path.span) {
             return;
         }
@@ -272,25 +267,32 @@ impl<'tcx> Visitor<'tcx> for SpanMapVisitor<'tcx> {
 
     fn visit_qpath(&mut self, qpath: &QPath<'tcx>, id: HirId, _span: rustc_span::Span) {
         match *qpath {
-            QPath::TypeRelative(qself, path) => {
-                if matches!(path.res, Res::Err) {
-                    let tcx = self.tcx;
-                    if let Some(body_id) = hir_enclosing_body_owner(tcx, id) {
-                        let typeck_results = tcx.typeck_body(tcx.hir_body_owned_by(body_id).id());
-                        let path = rustc_hir::Path {
-                            // We change the span to not include parens.
-                            span: path.ident.span,
-                            res: typeck_results.qpath_res(qpath, id),
-                            segments: &[],
-                        };
-                        self.handle_path(&path, false);
-                    }
-                } else {
-                    self.infer_id(path.hir_id, Some(id), path.ident.span.into());
+            QPath::TypeRelative(qself, segment) => {
+                // FIXME: This doesn't work for paths in *types* since HIR ty lowering currently
+                //        doesn't write back the resolution of type-relative paths. Updating it to
+                //        do so should be a simple fix.
+                // FIXME: This obviously doesn't support item signatures / non-bodies. Sadly, rustc
+                //        currently doesn't keep around that information & thus can't provide an API
+                //        for it.
+                //        `ItemCtxt`s would need a place to write back the resolution of type-
+                //        dependent definitions. Ideally there was some sort of query keyed on the
+                //        `LocalDefId` of the owning item that returns some table with which we can
+                //        map the `HirId` to a `DefId`.
+                //        Of course, we could re-HIR-ty-lower such paths *here* if we were to extend
+                //        the public API of HIR analysis. However, I strongly advise against it as
+                //        it would be too much of a hack.
+                if let Some(typeck_results) = self.maybe_typeck_results() {
+                    let path = hir::Path {
+                        // We change the span to not include parens.
+                        span: segment.ident.span,
+                        res: typeck_results.qpath_res(qpath, id),
+                        segments: std::slice::from_ref(segment),
+                    };
+                    self.handle_path(&path, false);
                 }
 
                 rustc_ast::visit::try_visit!(self.visit_ty_unambig(qself));
-                self.visit_path_segment(path);
+                self.visit_path_segment(segment);
             }
             QPath::Resolved(maybe_qself, path) => {
                 self.handle_path(path, true);
@@ -323,23 +325,27 @@ impl<'tcx> Visitor<'tcx> for SpanMapVisitor<'tcx> {
         intravisit::walk_mod(self, m);
     }
 
-    fn visit_expr(&mut self, expr: &'tcx rustc_hir::Expr<'tcx>) {
+    fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
         match expr.kind {
             ExprKind::MethodCall(segment, ..) => {
-                self.infer_id(segment.hir_id, Some(expr.hir_id), segment.ident.span.into())
-            }
-            ExprKind::Call(call, ..) => self.infer_id(call.hir_id, None, call.span.into()),
-            _ => {
-                if self.handle_macro(expr.span) {
-                    // We don't want to go deeper into the macro.
-                    return;
+                if let Some(typeck_results) = self.maybe_typeck_results()
+                    && let Some(def_id) = typeck_results.type_dependent_def_id(expr.hir_id)
+                {
+                    self.matches.insert(segment.ident.span.into(), self.link_for_def(def_id));
                 }
             }
+            // We don't want to go deeper into the macro.
+            _ if self.handle_macro(expr.span) => return,
+            _ => {}
         }
         intravisit::walk_expr(self, expr);
     }
 
     fn visit_item(&mut self, item: &'tcx Item<'tcx>) {
+        // We're no longer in a body since we've crossed an item boundary.
+        // Temporarily take away the typeck results which are only valid in bodies.
+        let maybe_typeck_results = self.maybe_typeck_results.take();
+
         match item.kind {
             ItemKind::Static(..)
             | ItemKind::Const(..)
@@ -359,6 +365,15 @@ impl<'tcx> Visitor<'tcx> for SpanMapVisitor<'tcx> {
             // We already have "visit_mod" above so no need to check it here.
             | ItemKind::Mod(..) => {}
         }
+
         intravisit::walk_item(self, item);
+
+        self.maybe_typeck_results = maybe_typeck_results;
     }
 }
+
+/// Lazily computed & cached [`ty::TypeckResults`].
+struct LazyTypeckResults<'tcx> {
+    body_id: hir::BodyId,
+    cache: Option<&'tcx ty::TypeckResults<'tcx>>,
+}
@@ -0,0 +1,20 @@
+// Like test `assoc-items.rs` but now utilizing unstable features.
+// FIXME: Make use of (m)GCA assoc consts once they no longer ICE!
+//@ compile-flags: -Zunstable-options --generate-link-to-definition
+#![feature(return_type_notation)]
+
+//@ has 'src/assoc_items_extra/assoc-items-extra.rs.html'
+
+trait Trait0 {
+    fn fn0() -> impl Sized;
+    fn fn1() -> impl Sized;
+}
+
+fn item<T: Trait0>()
+where
+    //@ has - '//a[@href="#9"]' 'fn0'
+    <T as Trait0>::fn0(..): Copy,   // Item, AssocFn,     Resolved
+    // FIXME: Support this:
+    //@ !has - '//a[@href="#10"]' 'fn1'
+    T::fn1(..): Copy,               // Item, AssocFn,    TypeRelative
+{}