Remove -Zinline-in-all-cgus

Author: saethlin

compiler/rustc_interface/src/tests.rs

@@ -789,7 +789,6 @@ fn test_unstable_options_tracking_hash() {
     tracked!(function_sections, Some(false));
     tracked!(human_readable_cgu_names, true);
     tracked!(incremental_ignore_spans, true);
-    tracked!(inline_in_all_cgus, Some(true));
     tracked!(inline_mir, Some(true));
     tracked!(inline_mir_hint_threshold, Some(123));
     tracked!(inline_mir_threshold, Some(123));

compiler/rustc_middle/src/mir/mono.rs

@@ -91,13 +91,8 @@ impl<'tcx> MonoItem<'tcx> {
     }
 
     pub fn instantiation_mode(&self, tcx: TyCtxt<'tcx>) -> InstantiationMode {
-        let generate_cgu_internal_copies = tcx
-            .sess
-            .opts
-            .unstable_opts
-            .inline_in_all_cgus
-            .unwrap_or_else(|| tcx.sess.opts.optimize != OptLevel::No)
-            && !tcx.sess.link_dead_code();
+        let generate_cgu_internal_copies =
+            (tcx.sess.opts.optimize != OptLevel::No) && !tcx.sess.link_dead_code();
 
         match *self {
             MonoItem::Fn(ref instance) => {
@@ -119,8 +114,8 @@ impl<'tcx> MonoItem<'tcx> {
                 }
 
                 // At this point we don't have explicit linkage and we're an
-                // inlined function. If we're inlining into all CGUs then we'll
-                // be creating a local copy per CGU.
+                // inlined function. If this crate's build settings permit,
+                // we'll be creating a local copy per CGU.
                 if generate_cgu_internal_copies {
                     return InstantiationMode::LocalCopy;
                 }

compiler/rustc_session/src/options.rs

@@ -1808,8 +1808,6 @@ options! {
         "verify extended properties for incr. comp. (default: no):
         - hashes of green query instances
         - hash collisions of query keys"),
-    inline_in_all_cgus: Option<bool> = (None, parse_opt_bool, [TRACKED],
-        "control whether `#[inline]` functions are in all CGUs"),
     inline_llvm: bool = (true, parse_bool, [TRACKED],
         "enable LLVM inlining (default: yes)"),
     inline_mir: Option<bool> = (None, parse_opt_bool, [TRACKED],

tests/codegen-units/item-collection/drop_in_place_intrinsic.rs

@@ -1,6 +1,4 @@
-//
 //@ compile-flags:-Zprint-mono-items=eager
-//@ compile-flags:-Zinline-in-all-cgus
 //@ compile-flags:-Zinline-mir=no
 
 #![feature(start)]

tests/codegen-units/item-collection/generic-drop-glue.rs

@@ -1,6 +1,4 @@
-//
 //@ compile-flags:-Zprint-mono-items=eager
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![deny(dead_code)]
 #![feature(start)]

tests/codegen-units/item-collection/instantiation-through-vtable.rs

@@ -1,5 +1,4 @@
-//
-//@ compile-flags:-Zprint-mono-items=eager -Zinline-in-all-cgus -Zmir-opt-level=0
+//@ compile-flags:-Zprint-mono-items=eager -Zmir-opt-level=0
 
 #![deny(dead_code)]
 #![feature(start)]

tests/codegen-units/item-collection/non-generic-drop-glue.rs

@@ -1,6 +1,4 @@
-//
 //@ compile-flags:-Zprint-mono-items=eager
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![deny(dead_code)]
 #![feature(start)]

tests/codegen-units/item-collection/transitive-drop-glue.rs

@@ -1,6 +1,4 @@
-//
 //@ compile-flags:-Zprint-mono-items=eager
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![deny(dead_code)]
 #![feature(start)]

tests/codegen-units/item-collection/tuple-drop-glue.rs

@@ -1,6 +1,4 @@
-//
 //@ compile-flags:-Zprint-mono-items=eager
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![deny(dead_code)]
 #![feature(start)]

tests/codegen-units/item-collection/unsizing.rs

@@ -1,5 +1,4 @@
 //@ compile-flags:-Zprint-mono-items=eager
-//@ compile-flags:-Zinline-in-all-cgus
 //@ compile-flags:-Zmir-opt-level=0
 
 #![deny(dead_code)]

tests/codegen-units/partitioning/extern-drop-glue.rs

@@ -2,7 +2,7 @@
 // We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
 //@ incremental
 //@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus -Copt-level=0
+//@ compile-flags:-Copt-level=0
 
 #![allow(dead_code)]
 #![crate_type = "rlib"]

tests/codegen-units/partitioning/inlining-from-extern-crate.rs

@@ -1,7 +1,6 @@
 // We specify incremental here because we want to test the partitioning for incremental compilation
 //@ incremental
 //@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![crate_type = "lib"]
 

tests/codegen-units/partitioning/local-drop-glue.rs

@@ -2,7 +2,7 @@
 // We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
 //@ incremental
 //@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus -Copt-level=0
+//@ compile-flags:-Copt-level=0
 
 #![allow(dead_code)]
 #![crate_type = "rlib"]
@@ -33,7 +33,7 @@ pub mod mod1 {
     //~ MONO_ITEM fn std::ptr::drop_in_place::<mod1::Struct2> - shim(Some(mod1::Struct2)) @@ local_drop_glue-fallback.cgu[External]
     struct Struct2 {
         _a: Struct,
-        //~ MONO_ITEM fn std::ptr::drop_in_place::<(u32, Struct)> - shim(Some((u32, Struct))) @@ local_drop_glue-fallback.cgu[Internal]
+        //~ MONO_ITEM fn std::ptr::drop_in_place::<(u32, Struct)> - shim(Some((u32, Struct))) @@ local_drop_glue-fallback.cgu[External]
         _b: (u32, Struct),
     }
 

tests/codegen-units/partitioning/local-inlining-but-not-all.rs

@@ -1,7 +1,6 @@
 // We specify incremental here because we want to test the partitioning for incremental compilation
 //@ incremental
-//@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus=no
+//@ compile-flags:-Zprint-mono-items=lazy -Copt-level=0
 
 #![allow(dead_code)]
 #![crate_type = "lib"]

tests/codegen-units/partitioning/local-inlining.rs

@@ -1,7 +1,6 @@
 // We specify incremental here because we want to test the partitioning for incremental compilation
 //@ incremental
 //@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![allow(dead_code)]
 #![crate_type = "lib"]

tests/codegen-units/partitioning/local-transitive-inlining.rs

@@ -1,7 +1,6 @@
 // We specify incremental here because we want to test the partitioning for incremental compilation
 //@ incremental
 //@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus
 
 #![allow(dead_code)]
 #![crate_type = "rlib"]

tests/codegen-units/partitioning/vtable-through-const.rs

@@ -1,7 +1,6 @@
 // We specify incremental here because we want to test the partitioning for incremental compilation
 //@ incremental
 //@ compile-flags:-Zprint-mono-items=lazy
-//@ compile-flags:-Zinline-in-all-cgus
 
 // This test case makes sure, that references made through constants are
 // recorded properly in the InliningMap.

tests/run-make/sepcomp-cci-copies/rmake.rs

@@ -8,7 +8,7 @@ use run_make_support::{count_regex_matches_in_files_with_extension, regex, rustc
 
 fn main() {
     rustc().input("cci_lib.rs").run();
-    rustc().input("foo.rs").emit("llvm-ir").codegen_units(6).arg("-Zinline-in-all-cgus").run();
+    rustc().input("foo.rs").emit("llvm-ir").codegen_units(6).arg("-O").arg("-Cno-prepopulate-passes").run();
     let re = regex::Regex::new(r#"define\ .*cci_fn"#).unwrap();
     assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 2);
 }

tests/run-make/sepcomp-inlining/rmake.rs

@@ -8,7 +8,7 @@
 use run_make_support::{count_regex_matches_in_files_with_extension, regex, rustc};
 
 fn main() {
-    rustc().input("foo.rs").emit("llvm-ir").codegen_units(3).arg("-Zinline-in-all-cgus").run();
+    rustc().input("foo.rs").emit("llvm-ir").codegen_units(3).arg("-O").arg("-Cno-prepopulate-passes").run();
     let re = regex::Regex::new(r#"define\ i32\ .*inlined"#).unwrap();
     assert_eq!(count_regex_matches_in_files_with_extension(&re, "ll"), 0);
     let re = regex::Regex::new(r#"define\ internal\ .*inlined"#).unwrap();