Use with_reduced_queries to avoid query cycles.

This changes the error message of `query-cycle-issue-124901.rs`, which
doesn't matter much.

Author: nnethercote

compiler/rustc_query_impl/src/plumbing.rs

@@ -327,21 +327,23 @@ pub(crate) fn create_query_frame<
         description
     };
 
-    let span = if kind == dep_graph::dep_kinds::def_span || reduce_queries {
+    let span = if reduce_queries {
         // The `def_span` query is used to calculate `default_span`,
         // so exit to avoid infinite recursion.
         None
     } else {
-        Some(key.default_span(tcx))
+        Some(tcx.with_reduced_queries(|| key.default_span(tcx)))
     };
 
     let def_id = key.key_as_def_id();
 
-    let def_kind = if kind == dep_graph::dep_kinds::def_kind || reduce_queries {
+    let def_kind = if reduce_queries {
         // Try to avoid infinite recursion.
         None
     } else {
-        def_id.and_then(|def_id| def_id.as_local()).map(|def_id| tcx.def_kind(def_id))
+        def_id
+            .and_then(|def_id| def_id.as_local())
+            .map(|def_id| tcx.with_reduced_queries(|| tcx.def_kind(def_id)))
     };
 
     let def_id_for_ty_in_cycle = key.def_id_for_ty_in_cycle();

tests/ui/resolve/query-cycle-issue-124901.rs

@@ -1,4 +1,4 @@
-//~ ERROR: cycle detected when looking up span for `Default`
+//~ ERROR: cycle detected when getting HIR ID of `Default`
 trait Default {
     type Id;
 

tests/ui/resolve/query-cycle-issue-124901.stderr

@@ -1,7 +1,10 @@
-error[E0391]: cycle detected when looking up span for `Default`
+error[E0391]: cycle detected when getting HIR ID of `Default`
    |
-   = note: ...which immediately requires looking up span for `Default` again
-   = note: cycle used when perform lints prior to AST lowering
+   = note: ...which requires getting the crate HIR...
+   = note: ...which requires perform lints prior to AST lowering...
+   = note: ...which requires looking up span for `Default`...
+   = note: ...which again requires getting HIR ID of `Default`, completing the cycle
+   = note: cycle used when getting the resolver for lowering
    = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
 
 error: aborting due to 1 previous error