Rollup merge of #157241 - aerooneqq:def-path-hash-instrumentation-fix, r=petrochenkov

Trace `?id.local_def_index` instead of `id` in `def_path_hash`

Trace `local_def_index` instead of `LocalDefId` in `def_path_hash`, as latter causes errors (previous version of this function accepted `DefIndex`).

Fixes #157238.
r? @petrochenkov

Author: JonathanBrouwer

compiler/rustc_hir/src/definitions.rs

@@ -252,7 +252,9 @@ impl Definitions {
         self.def_id_to_key[id]
     }
 
-    #[instrument(level = "trace", skip(self), ret)]
+    // Log debug version of `local_def_index` (just a number), as tracing of this function
+    // is called too early and cause errors if `LocalDefId` is logged (#157238).
+    #[instrument(level = "trace", skip(self, id), fields(def_index=?id.local_def_index), ret)]
     #[inline(always)]
     pub fn def_path_hash(&self, id: LocalDefId) -> DefPathHash {
         DefPathHash::new(self.stable_crate_id, self.def_path_hashes[id])

tests/ui/rustc-env/def-path-hash-ice-157238.rs

@@ -0,0 +1,9 @@
+//@ run-pass
+//
+// Ensure that `trace` level instrumentation in `def_path_hash` works,
+// see #157238.
+//
+//@ dont-check-compiler-stdout
+//@ dont-check-compiler-stderr
+//@ rustc-env:RUSTC_LOG=trace
+fn main() {}