add fn enclosing_body_owner to hir

Author: lcnr

src/librustc_typeck/collect/type_of.rs

@@ -35,7 +35,7 @@ pub(super) fn const_param_of(tcx: TyCtxt<'_>, def_id: DefId) -> Option<DefId> {
                     ExprKind::MethodCall(segment, ..) | ExprKind::Path(QPath::TypeRelative(_, segment)),
                 ..
             }) => {
-                let body_owner = tcx.hir().get_parent_did(parent_node_id);
+                let body_owner = tcx.hir().local_def_id(tcx.hir().enclosing_body_owner(hir_id));
                 let tables = tcx.typeck_tables_of(body_owner.to_def_id());
                 // This may fail in case the method/path does not actually exist.
                 // As there is no relevant param for `def_id`, we simply return
@@ -74,7 +74,7 @@ pub(super) fn const_param_of(tcx: TyCtxt<'_>, def_id: DefId) -> Option<DefId> {
                             | ExprKind::Struct(&QPath::Resolved(_, path), ..),
                         ..
                     }) => {
-                        let body_owner = tcx.hir().get_parent_did(parent_node_id);
+                        let body_owner = tcx.hir().local_def_id(tcx.hir().enclosing_body_owner(hir_id));
                         let _tables = tcx.typeck_tables_of(body_owner.to_def_id());
                         &*path
                     }