make eiiid map

Author: jdonszelmann

compiler/rustc_attr_parsing/src/attributes/mod.rs

@@ -27,6 +27,7 @@ pub(crate) mod allow_unstable;
 pub(crate) mod cfg;
 pub(crate) mod confusables;
 pub(crate) mod deprecation;
+pub(crate) mod eii;
 pub(crate) mod repr;
 pub(crate) mod rustc;
 pub(crate) mod stability;

compiler/rustc_resolve/src/def_collector.rs

@@ -8,8 +8,9 @@ use rustc_expand::expand::AstFragment;
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, CtorOf, DefKind};
 use rustc_hir::def_id::LocalDefId;
+use rustc_middle::bug;
 use rustc_span::hygiene::LocalExpnId;
-use rustc_span::{Span, Symbol, sym};
+use rustc_span::{EiiId, Span, Symbol, sym};
 use tracing::debug;
 
 use crate::{ImplTraitContext, InvocationParent, Resolver};
@@ -256,6 +257,22 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
 
         let def = self.create_def(fi.id, Some(fi.ident.name), def_kind, fi.span);
 
+        if let ForeignItemKind::Fn(_) = fi.kind {
+            for attr in &fi.attrs {
+                if attr.has_name(sym::eii)
+                    && let Some([arg]) = attr.meta_item_list().as_deref()
+                    && let Some(lit) = arg.lit()
+                    && let LitKind::Int(i, _) = lit.kind
+                    && let Ok(id) = u32::try_from(i.get())
+                {
+                    let id = EiiId::from(id);
+                    if let Some(other) = self.resolver.eii.insert(id, def) {
+                        bug!("{def:?}: {id:?} used more than once (used first on {other:?})");
+                    }
+                }
+            }
+        }
+
         self.with_parent(def, |this| visit::walk_item(this, fi));
     }
 

compiler/rustc_resolve/src/lib.rs

@@ -25,7 +25,6 @@ use std::cell::{Cell, RefCell};
 use std::collections::BTreeSet;
 use std::fmt;
 use std::sync::Arc;
-use rustc_span::EiiId,
 
 use diagnostics::{ImportSuggestion, LabelSuggestion, Suggestion};
 use effective_visibilities::EffectiveVisibilitiesVisitor;
@@ -71,7 +70,7 @@ use rustc_query_system::ich::StableHashingContext;
 use rustc_session::lint::builtin::PRIVATE_MACRO_USE;
 use rustc_session::lint::{BuiltinLintDiag, LintBuffer};
 use rustc_span::hygiene::{ExpnId, LocalExpnId, MacroKind, SyntaxContext, Transparency};
-use rustc_span::{DUMMY_SP, Ident, Span, Symbol, kw, sym};
+use rustc_span::{DUMMY_SP, EiiId, Ident, Span, Symbol, kw, sym};
 use smallvec::{SmallVec, smallvec};
 use tracing::debug;
 
@@ -1230,7 +1229,7 @@ pub struct Resolver<'ra, 'tcx> {
     mods_with_parse_errors: FxHashSet<DefId>,
 
     /// Map of defids for all items marked with #[eii(<eii id>)].
-    eii: FxHashMap<EiiId, DefId>,
+    eii: FxHashMap<EiiId, LocalDefId>,
 }
 
 /// This provides memory for the rest of the crate. The `'ra` lifetime that is
@@ -1576,6 +1575,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             impl_binding_keys: Default::default(),
             current_crate_outer_attr_insert_span,
             mods_with_parse_errors: Default::default(),
+            eii: Default::default(),
         };
 
         let root_parent_scope = ParentScope::module(graph_root, &resolver);