Auto merge of rust-lang#94402 - erikdesjardins:revert-coldland, r=nagisa

Revert "Auto merge of rust-lang#92419 - erikdesjardins:coldland, r=nagisa"

Should fix (untested) rust-lang#94390

Reopens rust-lang#46515, rust-lang#87055

r? `@ehuss`

Author: bors

Diff for: compiler/rustc_codegen_gcc/src/builder.rs

@@ -1403,7 +1403,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> {
         self.cx
     }
 
-    fn apply_attrs_to_cleanup_callsite(&mut self, _llret: RValue<'gcc>) {
+    fn do_not_inline(&mut self, _llret: RValue<'gcc>) {
         unimplemented!();
     }
 

Diff for: compiler/rustc_codegen_llvm/src/builder.rs

@@ -23,7 +23,6 @@ use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_span::Span;
 use rustc_target::abi::{self, call::FnAbi, Align, Size, WrappingRange};
 use rustc_target::spec::{HasTargetSpec, Target};
-use smallvec::SmallVec;
 use std::borrow::Cow;
 use std::ffi::CStr;
 use std::iter;
@@ -1179,19 +1178,9 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         unsafe { llvm::LLVMBuildZExt(self.llbuilder, val, dest_ty, UNNAMED) }
     }
 
-    fn apply_attrs_to_cleanup_callsite(&mut self, llret: &'ll Value) {
-        let mut attrs = SmallVec::<[_; 2]>::new();
-
-        // Cleanup is always the cold path.
-        attrs.push(llvm::AttributeKind::Cold.create_attr(self.llcx));
-
-        // In LLVM versions with deferred inlining (currently, system LLVM < 14),
-        // inlining drop glue can lead to exponential size blowup, see #41696 and #92110.
-        if !llvm_util::is_rust_llvm() && llvm_util::get_version() < (14, 0, 0) {
-            attrs.push(llvm::AttributeKind::NoInline.create_attr(self.llcx));
-        }
-
-        attributes::apply_to_callsite(llret, llvm::AttributePlace::Function, &attrs);
+    fn do_not_inline(&mut self, llret: &'ll Value) {
+        let noinline = llvm::AttributeKind::NoInline.create_attr(self.llcx);
+        attributes::apply_to_callsite(llret, llvm::AttributePlace::Function, &[noinline]);
     }
 }
 

Diff for: compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1933,8 +1933,6 @@ extern "C" {
     pub fn LLVMRustVersionMinor() -> u32;
     pub fn LLVMRustVersionPatch() -> u32;
 
-    pub fn LLVMRustIsRustLLVM() -> bool;
-
     /// Add LLVM module flags.
     ///
     /// In order for Rust-C LTO to work, module flags must be compatible with Clang. What

Diff for: compiler/rustc_codegen_llvm/src/llvm_util.rs

@@ -257,12 +257,6 @@ pub fn get_version() -> (u32, u32, u32) {
     }
 }
 
-/// Returns `true` if this LLVM is Rust's bundled LLVM (and not system LLVM).
-pub fn is_rust_llvm() -> bool {
-    // Can be called without initializing LLVM
-    unsafe { llvm::LLVMRustIsRustLLVM() }
-}
-
 pub fn print_passes() {
     // Can be called without initializing LLVM
     unsafe {

Diff for: compiler/rustc_codegen_ssa/src/mir/block.rs

@@ -166,7 +166,7 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
                 bx.invoke(fn_ty, fn_ptr, &llargs, ret_llbb, unwind_block, self.funclet(fx));
             bx.apply_attrs_callsite(&fn_abi, invokeret);
             if fx.mir[self.bb].is_cleanup {
-                bx.apply_attrs_to_cleanup_callsite(invokeret);
+                bx.do_not_inline(invokeret);
             }
 
             if let Some((ret_dest, target)) = destination {
@@ -178,7 +178,11 @@ impl<'a, 'tcx> TerminatorCodegenHelper<'tcx> {
             let llret = bx.call(fn_ty, fn_ptr, &llargs, self.funclet(fx));
             bx.apply_attrs_callsite(&fn_abi, llret);
             if fx.mir[self.bb].is_cleanup {
-                bx.apply_attrs_to_cleanup_callsite(llret);
+                // Cleanup is always the cold path. Don't inline
+                // drop glue. Also, when there is a deeply-nested
+                // struct, there are "symmetry" issues that cause
+                // exponential inlining - see issue #41696.
+                bx.do_not_inline(llret);
             }
 
             if let Some((ret_dest, target)) = destination {
@@ -1444,7 +1448,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
 
             let llret = bx.call(fn_ty, fn_ptr, &[], None);
             bx.apply_attrs_callsite(&fn_abi, llret);
-            bx.apply_attrs_to_cleanup_callsite(llret);
+            bx.do_not_inline(llret);
 
             bx.unreachable();
 

Diff for: compiler/rustc_codegen_ssa/src/traits/builder.rs

@@ -479,5 +479,5 @@ pub trait BuilderMethods<'a, 'tcx>:
     ) -> Self::Value;
     fn zext(&mut self, val: Self::Value, dest_ty: Self::Type) -> Self::Value;
 
-    fn apply_attrs_to_cleanup_callsite(&mut self, llret: Self::Value);
+    fn do_not_inline(&mut self, llret: Self::Value);
 }

Diff for: compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -694,14 +694,6 @@ extern "C" uint32_t LLVMRustVersionMinor() { return LLVM_VERSION_MINOR; }
 
 extern "C" uint32_t LLVMRustVersionMajor() { return LLVM_VERSION_MAJOR; }
 
-extern "C" bool LLVMRustIsRustLLVM() {
-#ifdef LLVM_RUSTLLVM
-  return true;
-#else
-  return false;
-#endif
-}
-
 extern "C" void LLVMRustAddModuleFlag(
     LLVMModuleRef M,
     Module::ModFlagBehavior MergeBehavior,

Diff for: src/test/codegen/unwind-landingpad-cold.rs

@@ -16,13 +16,32 @@ pub fn shrink_to_fit(vec: &mut Vec<u32>) {
 // CHECK-LABEL: @issue71861
 #[no_mangle]
 pub fn issue71861(vec: Vec<u32>) -> Box<[u32]> {
+    // CHECK-NOT: panic
+
+    // Call to panic_no_unwind in case of double-panic is expected,
+    // but other panics are not.
+    // CHECK: cleanup
+    // CHECK-NEXT: ; call core::panicking::panic_no_unwind
+    // CHECK-NEXT: panic_no_unwind
+
     // CHECK-NOT: panic
     vec.into_boxed_slice()
 }
 
 // CHECK-LABEL: @issue75636
 #[no_mangle]
 pub fn issue75636<'a>(iter: &[&'a str]) -> Box<[&'a str]> {
+    // CHECK-NOT: panic
+
+    // Call to panic_no_unwind in case of double-panic is expected,
+    // but other panics are not.
+    // CHECK: cleanup
+    // CHECK-NEXT: ; call core::panicking::panic_no_unwind
+    // CHECK-NEXT: panic_no_unwind
+
     // CHECK-NOT: panic
     iter.iter().copied().collect()
 }
+
+// CHECK: ; core::panicking::panic_no_unwind
+// CHECK: declare void @{{.*}}panic_no_unwind