Auto merge of rust-lang#135763 - nikic:llvm-20, r=<try>

Update to LLVM 20 LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd. * [x] rust-lang#135764 * [x] rust-lang#136134 * [x] rust-lang/compiler-builtins#752 * [ ] llvm/llvm-project#125287 * [ ] Update compiler-builtins Tested: host-x86_64, host-aarch64, mingw try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-x86_64-msvc try-job: dist-i686-msvc try-job: dist-aarch64-msvc
rust-lang-ci · Jan 31, 2025 · 23c742f · 23c742f
2 parents aa4cfd0 + 9539a55
commit 23c742f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/llvm-project b/src/llvm-project
diff --git a/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs b/tests/assembly/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs
@@ -242,7 +242,7 @@ pub unsafe extern "ptx-kernel" fn f_float_array_arg(_a: [f32; 5]) {}
 //pub unsafe extern "ptx-kernel" fn f_u128_array_arg(_a: [u128; 5]) {}
 
 // CHECK: .visible .entry f_u32_slice_arg(
-// CHECK: .param .u64 f_u32_slice_arg_param_0
+// CHECK: .param .u64 {{(\.ptr \.align 4 )?}}f_u32_slice_arg_param_0
 // CHECK: .param .u64 f_u32_slice_arg_param_1
 #[no_mangle]
 pub unsafe extern "ptx-kernel" fn f_u32_slice_arg(_a: &[u32]) {}