Fix incr issue

Author: JonathanBrouwer

compiler/rustc_lint/src/expect.rs

@@ -1,5 +1,6 @@
 use rustc_data_structures::fx::FxHashSet;
-use rustc_middle::lint::LintExpectation;
+use rustc_hir::find_attr;
+use rustc_middle::lint::{LintExpectation, ShallowLintLevelMap};
 use rustc_middle::query::Providers;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::lint::LintExpectationId;
@@ -20,10 +21,10 @@ fn lint_expectations(tcx: TyCtxt<'_>, (): ()) -> Vec<(LintExpectationId, LintExp
     for owner in krate.owners() {
         // Deduplicate expectations
         let mut inner_expectations = Vec::new();
-        let lints = tcx.shallow_lint_levels_on(owner);
+        let lints: &ShallowLintLevelMap = tcx.shallow_lint_levels_on(owner);
         for expectation in &lints.expectations {
-            let canonicalized = canonicalize_id(&expectation.0);
-            if !inner_expectations.iter().any(|(id, _)| canonicalize_id(id) == canonicalized) {
+            let canonicalized = canonicalize_id(tcx, &expectation.0);
+            if !inner_expectations.iter().any(|(id, _)| canonicalize_id(tcx, id) == canonicalized) {
                 inner_expectations.push(expectation.clone());
             }
         }
@@ -33,10 +34,16 @@ fn lint_expectations(tcx: TyCtxt<'_>, (): ()) -> Vec<(LintExpectationId, LintExp
     expectations
 }
 
-fn canonicalize_id(expect_id: &LintExpectationId) -> (rustc_span::AttrId, u16) {
+fn canonicalize_id(tcx: TyCtxt<'_>, expect_id: &LintExpectationId) -> (rustc_span::AttrId, u16) {
     match *expect_id {
-        LintExpectationId::Unstable { attr_id, lint_index, .. } => (attr_id, lint_index),
-        LintExpectationId::Stable { attr_id, lint_index, .. } => (attr_id, lint_index),
+        LintExpectationId::Unstable { attr_id, lint_index } => (attr_id, lint_index),
+        LintExpectationId::Stable { hir_id, attr_index, lint_index } => {
+            // We are an `eval_always` query, so looking at the attribute's `AttrId` is ok.
+            let attrs = find_attr!(tcx, hir_id, LintAttributes(lints) => lints).unwrap();
+            let attr_id = attrs[attr_index as usize].attr_id.attr_id;
+
+            (attr_id, lint_index)
+        }
     }
 }
 
@@ -46,15 +53,15 @@ fn check_expectations(tcx: TyCtxt<'_>, tool_filter: Option<Symbol>) {
 
     // Turn a `LintExpectationId` into a `(AttrId, lint_index)` pair.
     let fulfilled_expectations: FxHashSet<_> =
-        fulfilled_expectations.iter().map(canonicalize_id).collect();
+        fulfilled_expectations.iter().map(|id| canonicalize_id(tcx, id)).collect();
 
     for (expect_id, expectation) in lint_expectations {
         // This check will always be true, since `lint_expectations` only holds stable ids
         let LintExpectationId::Stable { hir_id, .. } = expect_id else {
             unreachable!("at this stage all `LintExpectationId`s are stable");
         };
 
-        let expect_id = canonicalize_id(expect_id);
+        let expect_id = canonicalize_id(tcx, expect_id);
 
         if !fulfilled_expectations.contains(&expect_id)
             && tool_filter.is_none_or(|filter| expectation.lint_tool == Some(filter))

compiler/rustc_lint/src/levels.rs

@@ -738,12 +738,9 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
                         let attr_index = attr_index.try_into().unwrap();
                         let expectation_id = match source_hir_id {
                             None => LintExpectationId::Unstable { attr_id, lint_index },
-                            Some(hir_id) => LintExpectationId::Stable {
-                                hir_id,
-                                attr_id,
-                                lint_index,
-                                attr_index,
-                            },
+                            Some(hir_id) => {
+                                LintExpectationId::Stable { hir_id, lint_index, attr_index }
+                            }
                         };
 
                         self.simple_add(Level::Expect, lint, *reason, Some(expectation_id));

compiler/rustc_lint_defs/src/lib.rs

@@ -110,7 +110,7 @@ pub enum LintExpectationId {
     /// stable and can be cached. The additional index ensures that nodes with
     /// several expectations can correctly match diagnostics to the individual
     /// expectation.
-    Stable { hir_id: HirId, attr_id: AttrId, attr_index: u16, lint_index: u16 },
+    Stable { hir_id: HirId, attr_index: u16, lint_index: u16 },
 }
 
 impl LintExpectationId {