WIP

Author: Kobzol

compiler/rustc_interface/src/passes.rs

@@ -90,6 +90,7 @@ fn pre_expansion_lint<'a>(
                 registered_tools,
                 None,
                 rustc_lint::BuiltinCombinedPreExpansionLintPass::new(),
+                None::<rustc_lint::BuiltinCombinedPreExpansionLintPass>,
                 check_node,
             );
         },
@@ -442,6 +443,7 @@ fn early_lint_checks(tcx: TyCtxt<'_>, (): ()) {
         tcx.registered_tools(()),
         Some(lint_buffer),
         rustc_lint::BuiltinCombinedEarlyLintPass::new(),
+        Some(rustc_lint::BuiltinCombinedEarlyLintPassMustRun::new()),
         (&**krate, &*krate.attrs),
     )
 }

compiler/rustc_lint/src/early.rs

@@ -7,23 +7,16 @@
 use rustc_ast::ptr::P;
 use rustc_ast::visit::{self as ast_visit, Visitor, walk_list};
 use rustc_ast::{self as ast, HasAttrs};
-use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_feature::Features;
-use rustc_hir::{HirId, ItemLocalId, OwnerId};
-use rustc_middle::hir;
-use rustc_middle::lint::LintLevelSource;
 use rustc_middle::ty::{RegisteredTools, TyCtxt};
 use rustc_session::lint::{BufferedEarlyLint, LintBuffer, LintPass};
 use rustc_session::{Session, lint};
-use rustc_span::def_id::CRATE_DEF_ID;
 use rustc_span::{Ident, Span};
 use tracing::debug;
 
-use crate::builtin::UnsafeCode;
 use crate::context::{EarlyContext, LintContext, LintStore};
 use crate::passes::{EarlyLintPass, EarlyLintPassObject};
-use crate::{Level, LintId};
 
 pub(super) mod diagnostics;
 
@@ -326,6 +319,7 @@ pub fn check_ast_node<'a>(
     registered_tools: &RegisteredTools,
     lint_buffer: Option<LintBuffer>,
     builtin_lints: impl EarlyLintPass + 'static,
+    builtin_lints_2: Option<impl EarlyLintPass + 'static>,
     check_node: impl EarlyCheckNode<'a>,
 ) {
     let context = EarlyContext::new(
@@ -343,33 +337,22 @@ pub fn check_ast_node<'a>(
     let passes =
         if pre_expansion { &lint_store.pre_expansion_passes } else { &lint_store.early_passes };
     if passes.is_empty() {
-        if let Some(tcx) = tcx {
-            if sess.opts.lint_cap.is_some_and(|cap| cap == lint::Allow) {
-                let lints_that_must_run = builtin_lints
-                    .get_lints()
-                    .into_iter()
-                    .filter(|lint| {
-                        let has_future_breakage = lint
-                            .future_incompatible
-                            .is_some_and(|fut| fut.reason.has_future_breakage());
-                        has_future_breakage || lint.eval_always
-                    })
-                    .collect::<Vec<_>>();
-                eprintln!(
-                    "LINT: must_run: {}, total: {}",
-                    lints_that_must_run.len(),
-                    builtin_lints.get_lints().len()
-                );
-                if !lints_that_must_run.is_empty() {
-                    check_ast_node_inner(sess, Some(tcx), check_node, context, UnsafeCode);
-                    return;
-                }
-            }
+        if let Some(builtin_lints_2) = builtin_lints_2
+            && sess.opts.lint_cap.is_some_and(|cap| cap == lint::Allow)
+        {
+            check_ast_node_inner(sess, tcx, check_node, context, builtin_lints_2);
+        } else {
+            check_ast_node_inner(sess, tcx, check_node, context, builtin_lints);
         }
-        check_ast_node_inner(sess, tcx, check_node, context, builtin_lints);
     } else {
         let mut passes: Vec<_> = passes.iter().map(|mk_pass| (mk_pass)()).collect();
-        passes.push(Box::new(builtin_lints));
+        if let Some(builtin_lints_2) = builtin_lints_2
+            && sess.opts.lint_cap.is_some_and(|cap| cap == lint::Allow)
+        {
+            passes.push(Box::new(builtin_lints_2));
+        } else {
+            passes.push(Box::new(builtin_lints));
+        }
         let pass = RuntimeCombinedEarlyLintPass { passes: &mut passes[..] };
         check_ast_node_inner(sess, tcx, check_node, context, pass);
     }

compiler/rustc_lint/src/lib.rs

@@ -186,6 +186,19 @@ early_lint_methods!(
     ]
 );
 
+early_lint_methods!(
+    declare_combined_early_lint_pass,
+    [
+        pub BuiltinCombinedEarlyLintPassMustRun,
+        [
+            UnsafeCode: UnsafeCode,
+            AnonymousParameters: AnonymousParameters,
+            EllipsisInclusiveRangePatterns: EllipsisInclusiveRangePatterns::default(),
+            Expr2024: Expr2024,
+        ]
+    ]
+);
+
 late_lint_methods!(
     declare_combined_late_lint_pass,
     [