Rollup of 9 pull requests

compiler/rustc_codegen_cranelift/example/mini_core.rs

@@ -497,7 +497,7 @@ pub trait FnMut<Args: Tuple>: FnOnce<Args> {
 pub fn panic(_msg: &'static str) -> ! {
     unsafe {
         libc::puts("Panicking\n\0" as *const str as *const i8);
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -539,7 +539,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
             len,
             index,
         );
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -548,7 +548,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
 fn panic_cannot_unwind() -> ! {
     unsafe {
         libc::puts("panic in a function that cannot unwind\n\0" as *const str as *const i8);
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -688,7 +688,7 @@ pub union MaybeUninit<T> {
 
 pub mod intrinsics {
     #[rustc_intrinsic]
-    pub fn abort() -> !;
+    pub fn abort_immediate() -> !;
     #[rustc_intrinsic]
     pub const fn size_of<T>() -> usize;
     #[rustc_intrinsic]

compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs

@@ -602,11 +602,11 @@ pub enum E2<X> {
 #[allow(unreachable_patterns)]
 fn check_niche_behavior() {
     if let E1::V2 { .. } = (E1::V1 { f: true }) {
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 
     if let E2::V1 { .. } = E2::V3::<Infallible> {
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 

compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

@@ -469,7 +469,7 @@ fn codegen_regular_intrinsic_call<'tcx>(
     let usize_layout = fx.layout_of(fx.tcx.types.usize);
 
     match intrinsic {
-        sym::abort => {
+        sym::abort_immediate => {
             fx.bcx.set_cold_block(fx.bcx.current_block().unwrap());
             fx.bcx.ins().trap(TrapCode::user(2).unwrap());
             return Ok(());

compiler/rustc_codegen_gcc/build_system/src/fuzz/reduce.rs

@@ -203,7 +203,7 @@ fn block_abort(file: &mut Vec<String>, path: &PathBuf, cache: &mut ResultCache)
         // ..and insert an unconditional call to abort.
         file_copy.insert(
             block_starts,
-            "Call(tmp = core::intrinsics::abort(), ReturnTo(bb1), UnwindUnreachable())\n"
+            "Call(tmp = core::intrinsics::abort_immediate(), ReturnTo(bb1), UnwindUnreachable())\n"
                 .to_string(),
         );
         file_copy.insert(block_starts, "let tmp = ();\n".to_string());

compiler/rustc_codegen_gcc/example/alloc_example.rs

@@ -20,12 +20,12 @@ extern "C" {
 
 #[panic_handler]
 fn panic_handler(_: &core::panic::PanicInfo<'_>) -> ! {
-    core::intrinsics::abort();
+    core::intrinsics::abort_immediate();
 }
 
 #[alloc_error_handler]
 fn alloc_error_handler(_: alloc::alloc::Layout) -> ! {
-    core::intrinsics::abort();
+    core::intrinsics::abort_immediate();
 }
 
 #[lang = "eh_personality"]

compiler/rustc_codegen_gcc/example/mini_core.rs

@@ -509,7 +509,7 @@ pub trait FnMut<Args: Tuple>: FnOnce<Args> {
 pub fn panic(_msg: &'static str) -> ! {
     unsafe {
         libc::puts("Panicking\n\0" as *const str as *const u8);
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -546,7 +546,7 @@ panic_const! {
 fn panic_cannot_unwind() -> ! {
     unsafe {
         libc::puts("Panicking\n\0" as *const str as *const u8);
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -555,7 +555,7 @@ fn panic_cannot_unwind() -> ! {
 fn panic_in_cleanup() -> ! {
     unsafe {
         libc::printf("panic in a destructor during cleanup\n\0" as *const str as *const i8);
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -568,7 +568,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
             len,
             index,
         );
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }
 
@@ -698,7 +698,7 @@ pub mod intrinsics {
     #[rustc_intrinsic]
     pub const fn black_box<T>(_dummy: T) -> T;
     #[rustc_intrinsic]
-    pub fn abort() -> !;
+    pub fn abort_immediate() -> !;
     #[rustc_intrinsic]
     pub const fn size_of<T>() -> usize;
     #[rustc_intrinsic]

compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs

@@ -438,10 +438,10 @@ pub enum E2<X> {
 #[allow(unreachable_patterns)]
 fn check_niche_behavior () {
     if let E1::V2 { .. } = (E1::V1 { f: true }) {
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 
     if let E2::V1 { .. } = E2::V3::<Infallible> {
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
 }

compiler/rustc_codegen_gcc/src/intrinsic/mod.rs

@@ -661,7 +661,7 @@ impl<'a, 'gcc, 'tcx> IntrinsicCallBuilderMethods<'tcx> for Builder<'a, 'gcc, 'tc
         llret
     }
 
-    fn abort(&mut self) {
+    fn abort_immediate(&mut self) {
         let func = self.context.get_builtin_function("__builtin_trap");
         self.block.add_eval(self.location, self.context.new_call(self.location, func, &[]));
     }

compiler/rustc_codegen_gcc/tests/run/abort1.rs

@@ -12,7 +12,7 @@ extern crate mini_core;
 use mini_core::*;
 
 fn test_fail() -> ! {
-    unsafe { intrinsics::abort() };
+    unsafe { intrinsics::abort_immediate() };
 }
 
 #[no_mangle]

compiler/rustc_codegen_gcc/tests/run/abort2.rs

@@ -12,7 +12,7 @@ extern crate mini_core;
 use mini_core::*;
 
 fn fail() -> i32 {
-    unsafe { intrinsics::abort() };
+    unsafe { intrinsics::abort_immediate() };
     0
 }
 

compiler/rustc_codegen_gcc/tests/run/always_inline.rs

@@ -47,7 +47,7 @@ fn fib_a(n: u8) -> u8 {
 #[no_mangle]
 extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
     if fib(2) != fib_a(2) {
-        intrinsics::abort();
+        intrinsics::abort_immediate();
     }
     0
 }

compiler/rustc_codegen_llvm/src/back/llvm_backend.rs

@@ -208,11 +208,12 @@ impl CodegenBackend for LlvmCodegenBackend {
         // Intrinsics whose fallback body will not be used by the LLVM backend.
         let replaced_intrinsics = {
             #[rustfmt::skip]
-            let mut will_not_use_fallback = vec![
+            let will_not_use_fallback = vec![
                 // These are mapped to LLVM intrinsics instead.
                 sym::unchecked_funnel_shl,
                 sym::unchecked_funnel_shr,
                 sym::carrying_mul_add,
+                sym::carryless_mul,
                 sym::integer_max,
                 sym::integer_min,
 
@@ -235,10 +236,6 @@ impl CodegenBackend for LlvmCodegenBackend {
                 sym::copysignf16, sym::copysignf32, sym::copysignf64, sym::copysignf128,
             ];
 
-            if llvm_util::get_version() >= (22, 0, 0) {
-                will_not_use_fallback.push(sym::carryless_mul);
-            }
-
             will_not_use_fallback
         };
 

compiler/rustc_codegen_llvm/src/builder.rs

@@ -919,9 +919,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
                     self.set_metadata_node(store, llvm::MD_nontemporal, &[one]);
                 }
             }
-            if flags.contains(MemFlags::CAPTURES_READ_ONLY)
-                && crate::llvm_util::get_version() >= (22, 0, 0)
-            {
+            if flags.contains(MemFlags::CAPTURES_READ_ONLY) {
                 assert!(
                     self.type_kind(self.val_ty(val)) == TypeKind::Pointer,
                     "CAPTURED_READ_ONLY is only supported on pointer stores"
@@ -1903,14 +1901,10 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
             return;
         }
 
-        if crate::llvm_util::get_version() >= (22, 0, 0) {
-            // LLVM 22 requires the lifetime intrinsic to act directly on the alloca,
-            // there can't be an addrspacecast in between.
-            let ptr = unsafe { llvm::LLVMRustStripPointerCasts(ptr) };
-            self.call_intrinsic(intrinsic, &[self.val_ty(ptr)], &[ptr]);
-        } else {
-            self.call_intrinsic(intrinsic, &[self.val_ty(ptr)], &[self.cx.const_u64(size), ptr]);
-        }
+        // LLVM 22 requires the lifetime intrinsic to act directly on the alloca,
+        // there can't be an addrspacecast in between.
+        let ptr = unsafe { llvm::LLVMRustStripPointerCasts(ptr) };
+        self.call_intrinsic(intrinsic, &[self.val_ty(ptr)], &[ptr]);
     }
 }
 impl<'a, 'll, CX: Borrow<SCx<'ll>>> GenericBuilder<'a, 'll, CX> {
@@ -2129,7 +2123,7 @@ impl<'a, 'll, 'tcx> Builder<'a, 'll, 'tcx> {
                     self.unreachable();
                 }
             } else {
-                self.abort();
+                self.abort_immediate();
                 self.unreachable();
             }
 

compiler/rustc_codegen_llvm/src/context.rs

@@ -195,33 +195,6 @@ pub(crate) unsafe fn create_module<'ll>(
     let mut target_data_layout = sess.target.data_layout.to_string();
     let llvm_version = llvm_util::get_version();
 
-    if llvm_version < (22, 0, 0) {
-        if sess.target.arch == Arch::Avr {
-            // LLVM 22.0 updated the default layout on avr: https://github.com/llvm/llvm-project/pull/153010
-            target_data_layout = target_data_layout.replace("n8:16", "n8")
-        }
-        if sess.target.arch == Arch::Nvptx64 {
-            // LLVM 22 updated the NVPTX layout to indicate 256-bit vector load/store: https://github.com/llvm/llvm-project/pull/155198
-            target_data_layout = target_data_layout.replace("-i256:256", "");
-        }
-        if sess.target.arch == Arch::PowerPC64 {
-            // LLVM 22 updated the ABI alignment for double on AIX: https://github.com/llvm/llvm-project/pull/144673
-            target_data_layout = target_data_layout.replace("-f64:32:64", "");
-
-            // LLVM 22 fixed the data layout calculation for targets that default to ELFv1
-            // when the ABI is set to ELFv2. With LLVM 21, the ELFv1 datalayout must be used,
-            // which will overalign function entries.
-            // https://github.com/llvm/llvm-project/pull/149725
-            if sess.target.llvm_target == "powerpc64-unknown-linux-gnu" {
-                target_data_layout = target_data_layout.replace("-Fn32", "-Fi64");
-            }
-        }
-        if sess.target.arch == Arch::AmdGpu {
-            // LLVM 22 specified ELF mangling in the amdgpu data layout:
-            // https://github.com/llvm/llvm-project/pull/163011
-            target_data_layout = target_data_layout.replace("-m:e", "");
-        }
-    }
     if llvm_version < (23, 0, 0) {
         if sess.target.arch == Arch::S390x {
             // LLVM 23 updated the s390x layout to specify the stack alignment: https://github.com/llvm/llvm-project/pull/176041