add resolver to attr parser

Author: jdonszelmann

compiler/rustc_attr_parsing/src/context.rs

@@ -213,7 +213,6 @@ impl<'sess> AttributeParser<'sess> {
         attrs: &'a [ast::Attribute],
         target_span: Span,
         omit_doc: OmitDoc,
-
         lower_span: impl Copy + Fn(Span) -> Span,
     ) -> Vec<Attribute> {
         let mut attributes = Vec::new();

compiler/rustc_middle/src/ty/mod.rs

@@ -48,7 +48,7 @@ use rustc_serialize::{Decodable, Encodable};
 use rustc_session::lint::LintBuffer;
 pub use rustc_session::lint::RegisteredTools;
 use rustc_span::hygiene::MacroKind;
-use rustc_span::{ExpnId, ExpnKind, Ident, Span, Symbol, kw, sym};
+use rustc_span::{EiiId, ExpnId, ExpnKind, Ident, Span, Symbol, kw, sym};
 pub use rustc_type_ir::relate::VarianceDiagInfo;
 pub use rustc_type_ir::*;
 use tracing::{debug, instrument};
@@ -217,6 +217,9 @@ pub struct ResolverAstLowering {
 
     /// Information about functions signatures for delegation items expansion
     pub delegation_fn_sigs: LocalDefIdMap<DelegationFnSig>,
+
+    /// Map of defids for all items marked with #[eii(<eii id>)].
+    pub eii: FxHashMap<EiiId, LocalDefId>,
 }
 
 #[derive(Debug)]

compiler/rustc_passes/src/check_attr.rs

@@ -457,7 +457,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
     }
 
     /// Checks if an `#[inline]` is applied to a function or a closure.
-    fn check_eii(&self, _hir_id: HirId, attr_span: Span, _defn_span: Span, target: Target) {
+    fn check_eii(&self, _hir_id: HirId, _attr_span: Span, _defn_span: Span, target: Target) {
         match target {
             Target::ForeignFn => {}
             target => {

compiler/rustc_resolve/src/def_collector.rs

@@ -138,6 +138,7 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
                     &i.attrs,
                     i.span,
                     OmitDoc::Skip,
+                    None,
                     std::convert::identity,
                 );
 

compiler/rustc_resolve/src/lib.rs

@@ -1689,6 +1689,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             lifetime_elision_allowed: self.lifetime_elision_allowed,
             lint_buffer: Steal::new(self.lint_buffer),
             delegation_fn_sigs: self.delegation_fn_sigs,
+            eii: self.eii,
         };
         ResolverOutputs { global_ctxt, ast_lowering }
     }