Use runtime late lint pass for builtin late lint pass

Author: compiler-errors

compiler/rustc_lint/src/late.rs

@@ -307,8 +307,8 @@ impl<'tcx, T: LateLintPass<'tcx>> hir_visit::Visitor<'tcx> for LateContextAndPas
 // `check_foo` method in `$methods` within this pass simply calls `check_foo`
 // once per `$pass`. Compare with `declare_combined_late_lint_pass`, which is
 // similar, but combines lint passes at compile time.
-struct RuntimeCombinedLateLintPass<'tcx> {
-    passes: Vec<LateLintPassObject<'tcx>>,
+pub struct RuntimeCombinedLateLintPass<'tcx> {
+    pub passes: Vec<LateLintPassObject<'tcx>>,
 }
 
 #[allow(rustc::lint_pass_impl_without_macro)]

compiler/rustc_lint/src/lib.rs

@@ -129,7 +129,7 @@ pub use context::{
     CheckLintNameResult, EarlyContext, FindLintError, LateContext, LintContext, LintStore,
 };
 pub use early::{EarlyCheckNode, check_ast_node};
-pub use late::{check_crate, late_lint_mod, unerased_lint_store};
+pub use late::{RuntimeCombinedLateLintPass, check_crate, late_lint_mod, unerased_lint_store};
 pub use passes::{EarlyLintPass, LateLintPass};
 pub use rustc_session::lint::Level::{self, *};
 pub use rustc_session::lint::{
@@ -146,7 +146,7 @@ pub fn provide(providers: &mut Providers) {
 }
 
 fn lint_mod(tcx: TyCtxt<'_>, module_def_id: LocalModDefId) {
-    late_lint_mod(tcx, module_def_id, BuiltinCombinedModuleLateLintPass::new());
+    late_lint_mod(tcx, module_def_id, BuiltinCombinedModuleLateLintPass::new(tcx));
 }
 
 early_lint_methods!(

compiler/rustc_lint/src/passes.rs

@@ -72,18 +72,11 @@ late_lint_methods!(declare_late_lint_pass, []);
 
 impl LateLintPass<'_> for HardwiredLints {}
 
-#[macro_export]
-macro_rules! expand_combined_late_lint_pass_method {
-    ([$($pass:ident),*], $self: ident, $name: ident, $params:tt) => ({
-        $($self.$pass.$name $params;)*
-    })
-}
-
 #[macro_export]
 macro_rules! expand_combined_late_lint_pass_methods {
     ($passes:tt, [$($(#[$attr:meta])* fn $name:ident($($param:ident: $arg:ty),*);)*]) => (
         $(fn $name(&mut self, context: &$crate::LateContext<'tcx>, $($param: $arg),*) {
-            $crate::expand_combined_late_lint_pass_method!($passes, self, $name, (context, $($param),*));
+            self.inner.$name(context$(, $param)*);
         })*
     )
 }
@@ -97,15 +90,15 @@ macro_rules! expand_combined_late_lint_pass_methods {
 macro_rules! declare_combined_late_lint_pass {
     ([$v:vis $name:ident, [$($pass:ident: $constructor:expr,)*]], $methods:tt) => (
         #[allow(non_snake_case)]
-        $v struct $name {
-            $($pass: $pass,)*
+        $v struct $name<'tcx> {
+            inner: RuntimeCombinedLateLintPass<'tcx>,
         }
 
-        impl $name {
-            $v fn new() -> Self {
-                Self {
-                    $($pass: $constructor,)*
-                }
+        impl<'tcx> $name<'tcx> {
+            $v fn new(_tcx: TyCtxt<'tcx>) -> Self {
+                let mut passes = vec![];
+                $(passes.push(Box::new($constructor) as Box<dyn LateLintPass<'tcx>>);)*
+                $name { inner: RuntimeCombinedLateLintPass { passes } }
             }
 
             $v fn get_lints() -> $crate::LintVec {
@@ -115,12 +108,12 @@ macro_rules! declare_combined_late_lint_pass {
             }
         }
 
-        impl<'tcx> $crate::LateLintPass<'tcx> for $name {
+        impl<'tcx> $crate::LateLintPass<'tcx> for $name<'tcx> {
             $crate::expand_combined_late_lint_pass_methods!([$($pass),*], $methods);
         }
 
         #[allow(rustc::lint_pass_impl_without_macro)]
-        impl $crate::LintPass for $name {
+        impl $crate::LintPass for $name<'_> {
             fn name(&self) -> &'static str {
                 panic!()
             }