Add some logging

Author: camelid

compiler/rustc_ast_lowering/src/lib.rs

@@ -1163,6 +1163,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         }
     }
 
+    #[instrument(level = "debug", skip(self))]
     fn lower_const_path_as_const_arg(
         &mut self,
         path: &Path,
@@ -1233,11 +1234,13 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 
     #[instrument(level = "debug", skip(self))]
     fn lower_anon_const_as_const_arg_direct(&mut self, anon: &AnonConst) -> hir::ConstArg<'hir> {
+        let maybe_res = self
+            .resolver
+            .get_partial_res(anon.value.id)
+            .and_then(|partial_res| partial_res.full_res());
+        debug!("res={:?}", maybe_res);
         if let ExprKind::Path(qself, path) = &anon.value.kind
-            && let Some(res) = self
-                .resolver
-                .get_partial_res(anon.value.id)
-                .and_then(|partial_res| partial_res.full_res())
+            && let Some(res) = maybe_res
             // FIXME(min_generic_const_exprs): for now we only lower params to ConstArgKind::Path
             && let Res::Def(DefKind::ConstParam, _) = res
         {

compiler/rustc_middle/src/hir/mod.rs

@@ -17,6 +17,7 @@ use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId};
 use rustc_hir::*;
 use rustc_macros::{Decodable, Encodable, HashStable};
 use rustc_span::{ErrorGuaranteed, ExpnId};
+use tracing::debug;
 
 /// Gather the LocalDefId for each item-like within a module, including items contained within
 /// bodies. The Ids are in visitor order. This is used to partition a pass between modules.
@@ -163,10 +164,15 @@ pub fn provide(providers: &mut Providers) {
     providers.hir_crate_items = map::hir_crate_items;
     providers.crate_hash = map::crate_hash;
     providers.hir_module_items = map::hir_module_items;
-    providers.local_def_id_to_hir_id = |tcx, def_id| match tcx.hir_crate(()).owners[def_id] {
-        MaybeOwner::Owner(_) => HirId::make_owner(def_id),
-        MaybeOwner::NonOwner(hir_id) => hir_id,
-        MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id),
+    providers.local_def_id_to_hir_id = |tcx, def_id| {
+        if !def_id.is_top_level_module() {
+            debug!("ATTN! {:?} {:?}", tcx.def_kind(def_id), tcx.parent(def_id.into()));
+        }
+        match tcx.hir_crate(()).owners[def_id] {
+            MaybeOwner::Owner(_) => HirId::make_owner(def_id),
+            MaybeOwner::NonOwner(hir_id) => hir_id,
+            MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id),
+        }
     };
     providers.opt_hir_owner_nodes =
         |tcx, id| tcx.hir_crate(()).owners.get(id)?.as_owner().map(|i| &i.nodes);