Show nested items in rustc_dump_def_parents

compiler/rustc_hir_analysis/src/collect/dump.rs

@@ -59,6 +59,11 @@ pub(crate) fn def_parents(tcx: TyCtxt<'_>) {
                     self.tcx.hir()
                 }
 
+                fn visit_item(&mut self, i: &'tcx rustc_hir::Item<'tcx>) -> Self::Result {
+                    self.defs.push(i.owner_id.def_id);
+                    intravisit::walk_item(self, i)
+                }
+
                 fn visit_anon_const(&mut self, c: &'tcx rustc_hir::AnonConst) {
                     self.defs.push(c.def_id);
                     intravisit::walk_anon_const(self, c)
@@ -76,13 +81,13 @@ pub(crate) fn def_parents(tcx: TyCtxt<'_>) {
             // Look for any anon consts inside of this body owner as there is no way to apply
             // the `rustc_dump_def_parents` attribute to the anon const so it would not be possible
             // to see what its def parent is.
-            let mut expr_def_finder = ExprDefFinder { tcx, defs: vec![] };
+            let mut def_finder = ExprDefFinder { tcx, defs: vec![] };
             tcx.hir()
                 .fn_decl_by_hir_id(tcx.local_def_id_to_hir_id(did))
-                .map(|decl| intravisit::walk_fn_decl(&mut expr_def_finder, decl));
-            intravisit::walk_expr(&mut expr_def_finder, tcx.hir().body_owned_by(did).value);
+                .map(|decl| intravisit::walk_fn_decl(&mut def_finder, decl));
+            intravisit::walk_expr(&mut def_finder, tcx.hir().body_owned_by(did).value);
 
-            for did in [did].into_iter().chain(expr_def_finder.defs) {
+            for did in [did].into_iter().chain(def_finder.defs) {
                 let span = tcx.def_span(did);
 
                 let mut diag = tcx.dcx().struct_span_err(

compiler/rustc_passes/src/hir_id_validator.rs

@@ -91,11 +91,12 @@ impl<'a, 'hir> HirIdValidator<'a, 'hir> {
         if def_parent_hir_id.owner != owner {
             self.error(|| {
                 format!(
-                    "inconsistent Def parent at `{:?}` for `{:?}`:\nexpected={:?}\nfound={:?}",
+                    "inconsistent Def parent at `{:?}` for `{:?}`:\nexpected={:?}\nfound={:?} ({:?})",
                     self.tcx.def_span(id),
                     id,
                     owner,
-                    def_parent_hir_id
+                    def_parent_hir_id,
+                    def_parent,
                 )
             });
         }

tests/ui/attributes/dump_def_parents.rs

@@ -11,6 +11,7 @@ fn bar() {
                     {
                         //~^ ERROR: rustc_dump_def_parents: DefId
                         fn doesnt_inhibit_dump() {
+                            //~^ ERROR: rustc_dump_def_parents: DefId
                             qux::<
                                 {
                                     //~^ ERROR: rustc_dump_def_parents: DefId

tests/ui/attributes/dump_def_parents.stderr

@@ -87,6 +87,39 @@ LL | |
 LL | | fn main() {}
    | |____________^
 
+error: rustc_dump_def_parents: DefId(..)
+  --> $DIR/dump_def_parents.rs:13:25
+   |
+LL |                         fn doesnt_inhibit_dump() {
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: DefId(..)
+  --> $DIR/dump_def_parents.rs:6:9
+   |
+LL |         fn baz() {
+   |         ^^^^^^^^
+note: DefId(..)
+  --> $DIR/dump_def_parents.rs:5:5
+   |
+LL |     fn foo() {
+   |     ^^^^^^^^
+note: DefId(..)
+  --> $DIR/dump_def_parents.rs:4:1
+   |
+LL | fn bar() {
+   | ^^^^^^^^
+note: DefId(..)
+  --> $DIR/dump_def_parents.rs:2:1
+   |
+LL | / #![feature(rustc_attrs)]
+LL | |
+LL | | fn bar() {
+LL | |     fn foo() {
+...  |
+LL | |
+LL | | fn main() {}
+   | |____________^
+
 error: rustc_dump_def_parents: DefId(..)
   --> $DIR/dump_def_parents.rs:15:33
    |
@@ -184,5 +217,5 @@ LL | |
 LL | | fn main() {}
    | |____________^
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors