don't collect #[rustc_force_inline] in eager mode

Author: davidtwco

compiler/rustc_monomorphize/src/collector.rs

@@ -960,12 +960,10 @@ fn should_codegen_locally<'tcx>(tcx: TyCtxtAt<'tcx>, instance: Instance<'tcx>) -
         return false;
     }
 
-    if tcx.def_kind(def_id).has_codegen_attrs()
-        && matches!(tcx.codegen_fn_attrs(def_id).inline, InlineAttr::Force { .. })
-    {
+    if tcx.def_kind(def_id).has_codegen_attrs() {
         // `#[rustc_force_inline]` items should never be codegened. This should be caught by
         // the MIR validator.
-        return false;
+        assert!(!matches!(tcx.codegen_fn_attrs(def_id).inline, InlineAttr::Force { .. }));
     }
 
     if def_id.is_local() {
@@ -1462,7 +1460,9 @@ impl<'v> RootCollector<'_, 'v> {
     fn is_root(&self, def_id: LocalDefId) -> bool {
         !self.tcx.generics_of(def_id).requires_monomorphization(self.tcx)
             && match self.strategy {
-                MonoItemCollectionStrategy::Eager => true,
+                MonoItemCollectionStrategy::Eager => {
+                    !matches!(self.tcx.codegen_fn_attrs(def_id).inline, InlineAttr::Force { .. })
+                }
                 MonoItemCollectionStrategy::Lazy => {
                     self.entry_fn.and_then(|(id, _)| id.as_local()) == Some(def_id)
                         || self.tcx.is_reachable_non_generic(def_id)

tests/mir-opt/inline/forced.caller.ForceInline.diff

@@ -9,7 +9,7 @@
 
       bb0: {
           StorageLive(_1);
--         _1 = callee_forced() -> [return: bb1, unwind continue];
+-         _1 = callee_forced() -> [return: bb1, unwind unreachable];
 -     }
 - 
 -     bb1: {

tests/mir-opt/inline/forced_closure.caller-{closure#0}.ForceInline.diff

@@ -9,7 +9,7 @@
 
       bb0: {
           StorageLive(_2);
--         _2 = callee_forced() -> [return: bb1, unwind continue];
+-         _2 = callee_forced() -> [return: bb1, unwind unreachable];
 -     }
 - 
 -     bb1: {

tests/mir-opt/inline/forced_dead_code.caller.ForceInline.diff

@@ -0,0 +1,21 @@
+- // MIR for `caller` before ForceInline
++ // MIR for `caller` after ForceInline
+  
+  fn caller() -> () {
+      let mut _0: ();
+      let _1: ();
++     scope 1 (inlined callee_forced) {
++     }
+  
+      bb0: {
+          StorageLive(_1);
+-         _1 = callee_forced() -> [return: bb1, unwind unreachable];
+-     }
+- 
+-     bb1: {
+          StorageDead(_1);
+          _0 = const ();
+          return;
+      }
+  }
+  

tests/mir-opt/inline/forced_dead_code.rs

@@ -0,0 +1,17 @@
+// EMIT_MIT_FOR_EACH_PANIC_STRATEGY
+//@ compile-flags: -Copt-level=0 -Clink-dead-code
+#![feature(rustc_attrs)]
+
+#[rustc_force_inline]
+pub fn callee_forced() {}
+
+// EMIT_MIR forced_dead_code.caller.ForceInline.diff
+pub fn caller() {
+    callee_forced();
+    // CHECK-LABEL: fn caller(
+    // CHECK: (inlined callee_forced)
+}
+
+fn main() {
+    caller();
+}