[gcc r11-10823] libstdc++: Fix type of first argument to vec_cntm call

[Matthias Kretz <mkretz@gcc.gnu.org>]

https://gcc.gnu.org/g:0860e7d46f7fa4e1bcd373feee3bc673d4260b8b

commit r11-10823-g0860e7d46f7fa4e1bcd373feee3bc673d4260b8b
Author: Matthias Kretz <m.kretz@gsi.de>
Date:   Wed May 24 16:43:07 2023 +0200

    libstdc++: Fix type of first argument to vec_cntm call
    
    Signed-off-by: Matthias Kretz <m.kretz@gsi.de>
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/109949
            * include/experimental/bits/simd.h (__intrinsic_type): If
            __ALTIVEC__ is defined, map gnu::vector_size types to their
            corresponding __vector T types without losing unsignedness of
            integer types. Also prefer long long over long.
            * include/experimental/bits/simd_ppc.h (_S_popcount): Cast mask
            object to the expected unsigned vector type.
    
    (cherry picked from commit efd2b55d8562c6e80cb7ee8b9b1f9418f0c00cd9)

Diff:
---
 libstdc++-v3/include/experimental/bits/simd.h     | 39 ++++++++++++++++++++---
 libstdc++-v3/include/experimental/bits/simd_ppc.h |  3 +-
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/libstdc++-v3/include/experimental/bits/simd.h b/libstdc++-v3/include/experimental/bits/simd.h
index 7e877e85f80..a7e9443828e 100644
--- a/libstdc++-v3/include/experimental/bits/simd.h
+++ b/libstdc++-v3/include/experimental/bits/simd.h
@@ -2337,11 +2337,40 @@ template <typename _Tp, size_t _Bytes>
 		  "no __intrinsic_type support for 64-bit floating point on PowerPC w/o VSX");
 #endif
 
-    using type =
-      typename __intrinsic_type_impl<
-		 conditional_t<is_floating_point_v<_Tp>,
-			       conditional_t<_S_is_ldouble, double, _Tp>,
-			       __int_for_sizeof_t<_Tp>>>::type;
+    static constexpr auto __element_type()
+    {
+      if constexpr (is_floating_point_v<_Tp>)
+	{
+	  if constexpr (_S_is_ldouble)
+	    return double {};
+	  else
+	    return _Tp {};
+	}
+      else if constexpr (is_signed_v<_Tp>)
+	{
+	  if constexpr (sizeof(_Tp) == sizeof(_SChar))
+	    return _SChar {};
+	  else if constexpr (sizeof(_Tp) == sizeof(short))
+	    return short {};
+	  else if constexpr (sizeof(_Tp) == sizeof(int))
+	    return int {};
+	  else if constexpr (sizeof(_Tp) == sizeof(_LLong))
+	    return _LLong {};
+	}
+      else
+	{
+	  if constexpr (sizeof(_Tp) == sizeof(_UChar))
+	    return _UChar {};
+	  else if constexpr (sizeof(_Tp) == sizeof(_UShort))
+	    return _UShort {};
+	  else if constexpr (sizeof(_Tp) == sizeof(_UInt))
+	    return _UInt {};
+	  else if constexpr (sizeof(_Tp) == sizeof(_ULLong))
+	    return _ULLong {};
+	}
+    }
+
+    using type = typename __intrinsic_type_impl<decltype(__element_type())>::type;
   };
 #endif // __ALTIVEC__
 
diff --git a/libstdc++-v3/include/experimental/bits/simd_ppc.h b/libstdc++-v3/include/experimental/bits/simd_ppc.h
index de1e3e76f2a..f1fec53cc79 100644
--- a/libstdc++-v3/include/experimental/bits/simd_ppc.h
+++ b/libstdc++-v3/include/experimental/bits/simd_ppc.h
@@ -130,7 +130,8 @@ template <typename _Abi>
 	const auto __kv = __as_vector(__k);
 	if constexpr (__have_power10vec)
 	  {
-	    return vec_cntm(__to_intrin(__kv), 1);
+	    using _Intrin = __intrinsic_type16_t<make_unsigned_t<__int_for_sizeof_t<_Tp>>>;
+	    return vec_cntm(reinterpret_cast<_Intrin>(__kv), 1);
 	  }
 	else if constexpr (sizeof(_Tp) >= sizeof(int))
 	  {