Unrolled build for rust-lang#125996

rust-timer · web-flow · commit 7d730724c848 · 2024-06-05T10:17:43.000-04:00
Rollup merge of rust-lang#125996 - tmiasko:closure-recursively-reachable, r=oli-obk Closures are recursively reachable Fixes rust-lang#126012.
diff --git a/compiler/rustc_passes/src/reachable.rs b/compiler/rustc_passes/src/reachable.rs
@@ -157,6 +157,7 @@ impl<'tcx> ReachableContext<'tcx> {
                 }
                 hir::ImplItemKind::Type(_) => false,
             },
+            Node::Expr(&hir::Expr { kind: hir::ExprKind::Closure(..), .. }) => true,
             _ => false,
         }
     }
diff --git a/tests/ui/cross-crate/auxiliary/static_init_aux.rs b/tests/ui/cross-crate/auxiliary/static_init_aux.rs
@@ -3,6 +3,12 @@ pub static F: fn() = f;
 pub static G: fn() = G0;
 pub static H: &(dyn Fn() + Sync) = &h;
 pub static I: fn() = Helper(j).mk();
+pub static K: fn() -> fn() = {
+    #[inline(never)]
+    fn k() {}
+    #[inline(always)]
+    || -> fn() { k }
+};
 
 static X: u32 = 42;
 static G0: fn() = g;
diff --git a/tests/ui/cross-crate/static-init.rs b/tests/ui/cross-crate/static-init.rs
@@ -8,6 +8,7 @@ static F: fn() = aux::F;
 static G: fn() = aux::G;
 static H: &(dyn Fn() + Sync) = aux::H;
 static I: fn() = aux::I;
+static K: fn() -> fn() = aux::K;
 
 fn v() -> *const u32 {
     V
@@ -19,4 +20,5 @@ fn main() {
     G();
     H();
     I();
+    K()();
 }

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ impl<'tcx> ReachableContext<'tcx> {`
`157`	`157`	`}`
`158`	`158`	`hir::ImplItemKind::Type(_) => false,`
`159`	`159`	`},`
	`160`	`+ Node::Expr(&hir::Expr { kind: hir::ExprKind::Closure(..), .. }) => true,`
`160`	`161`	`_ => false,`
`161`	`162`	`}`
`162`	`163`	`}`