rustc_middle: Fix opt_item_ident for non-local def ids

2023-05-03 19:27:29 +03:00
parent 82cd953c7c
commit 6f6c379ee0
23 changed files with 88 additions and 42 deletions
--- a/compiler/rustc_middle/src/ty/mod.rs
+++ b/compiler/rustc_middle/src/ty/mod.rs
@@ -2109,10 +2109,9 @@ impl<'tcx> TyCtxt<'tcx> {
    /// See [`item_name`][Self::item_name] for more information.
    pub fn opt_item_ident(self, def_id: DefId) -> Option<Ident> {
        let def = self.opt_item_name(def_id)?;
-        let span = def_id
-            .as_local()
-            .and_then(|id| self.def_ident_span(id))
-            .unwrap_or(rustc_span::DUMMY_SP);
+        let span = self
+            .def_ident_span(def_id)
+            .unwrap_or_else(|| bug!("missing ident span for {def_id:?}"));
        Some(Ident::new(def, span))
    }