Merge commit '6d35b4c9a0' into sync_cg_clif-2024-09-22

compiler/rustc_codegen_cranelift/patches/0001-portable-simd-Disable-broken-reduce_sum-test.patch

@@ -0,0 +1,26 @@
+From 5489384bc265e9e6fc2efaa63d93a4d51ebec2f5 Mon Sep 17 00:00:00 2001
+From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
+Date: Thu, 22 Aug 2024 19:22:58 +0000
+Subject: [PATCH] Disable broken reduce_sum test
+
+It was broken by an upstream change to the .sum() implementation on
+float iterators.
+---
+ crates/core_simd/tests/ops_macros.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/crates/core_simd/tests/ops_macros.rs b/crates/core_simd/tests/ops_macros.rs
+index aa565a1..5e6ac41 100644
+--- a/crates/core_simd/tests/ops_macros.rs
++++ b/crates/core_simd/tests/ops_macros.rs
+@@ -646,6 +646,7 @@ macro_rules! impl_float_tests {
+                 }
+ 
+                 fn reduce_sum<const LANES: usize>() {
++                    return;
+                     test_helpers::test_1(&|x| {
+                         test_helpers::prop_assert_biteq! (
+                             Vector::<LANES>::from_array(x).reduce_sum(),
+-- 
+2.34.1
+

compiler/rustc_codegen_cranelift/patches/0022-coretests-Disable-not-compiling-tests.patch

@@ -38,7 +38,7 @@ index 42a26ae..5ac1042 100644
 @@ -1,3 +1,4 @@
 +#![cfg(test)]
  // tidy-alphabetical-start
- #![cfg_attr(bootstrap, feature(offset_of_nested))]
+ #![cfg_attr(bootstrap, feature(const_mut_refs))]
  #![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
 --
 2.21.0 (Apple Git-122)

compiler/rustc_codegen_cranelift/patches/0027-coretests-128bit-atomic-operations.patch

@@ -14,14 +14,13 @@ diff --git a/lib.rs b/lib.rs
 index 1e336bf..35e6f54 100644
 --- a/lib.rs
 +++ b/lib.rs
-@@ -1,7 +1,6 @@
+@@ -1,6 +1,5 @@
  #![cfg(test)]
  // tidy-alphabetical-start
- #![cfg_attr(bootstrap, feature(offset_of_nested))]
+ #![cfg_attr(bootstrap, feature(const_mut_refs))]
 -#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
  #![cfg_attr(test, feature(cfg_match))]
  #![feature(alloc_layout_extra)]
- #![feature(array_chunks)]
 diff --git a/atomic.rs b/atomic.rs
 index b735957..ea728b6 100644
 --- a/atomic.rs

compiler/rustc_codegen_cranelift/patches/0028-coretests-Disable-long-running-tests.patch

@@ -43,6 +43,26 @@ index 8402833..84592e0 100644
  
  #[test]
  fn test_slice_from_ptr_range() {
+diff --git a/lazy.rs b/lazy.rs
+index 711511e..49c8d78 100644
+--- a/lazy.rs
++++ b/lazy.rs
+@@ -113,6 +113,7 @@ fn lazy_type_inference() {
+     let _ = LazyCell::new(|| ());
+ }
+ 
++/*
+ #[test]
+ #[should_panic = "LazyCell instance has previously been poisoned"]
+ fn lazy_force_mut_panic() {
+@@ -123,6 +124,7 @@ fn lazy_force_mut_panic() {
+     .unwrap_err();
+     let _ = &*lazy;
+ }
++*/
+ 
+ #[test]
+ fn lazy_force_mut() {
 -- 
 2.26.2.7.g19db9cfb68