diff options
| author | Matthias Kretz <m.kretz@gsi.de> | 2023-02-02 12:29:33 +0100 |
|---|---|---|
| committer | Matthias Kretz <m.kretz@gsi.de> | 2023-02-16 15:58:33 +0100 |
| commit | 1fd3836463c65f695831ef04c7dbda1e7a1794ba (patch) | |
| tree | f4749cf2508064342cb5ef74eb53671bc8ff1f70 | |
| parent | 07e4648b4ab86a76ab040ea18a756e388652c882 (diff) | |
| download | gcc-1fd3836463c65f695831ef04c7dbda1e7a1794ba.zip gcc-1fd3836463c65f695831ef04c7dbda1e7a1794ba.tar.gz gcc-1fd3836463c65f695831ef04c7dbda1e7a1794ba.tar.bz2 | |
libstdc++: Fix incorrect __builtin_is_constant_evaluated calls
Signed-off-by: Matthias Kretz <m.kretz@gsi.de>
libstdc++-v3/ChangeLog:
* include/experimental/bits/simd_x86.h
(_SimdImplX86::_S_not_equal_to, _SimdImplX86::_S_less)
(_SimdImplX86::_S_less_equal): Do not call
__builtin_is_constant_evaluated in constexpr-if.
| -rw-r--r-- | libstdc++-v3/include/experimental/bits/simd_x86.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libstdc++-v3/include/experimental/bits/simd_x86.h b/libstdc++-v3/include/experimental/bits/simd_x86.h index 60e80d3..dcfdc2a 100644 --- a/libstdc++-v3/include/experimental/bits/simd_x86.h +++ b/libstdc++-v3/include/experimental/bits/simd_x86.h @@ -2344,15 +2344,16 @@ template <typename _Abi, typename> else __assert_unreachable<_Tp>(); } // }}} - else if constexpr (!__builtin_is_constant_evaluated() // {{{ - && sizeof(__x) == 8) + else if (__builtin_is_constant_evaluated()) + return _Base::_S_not_equal_to(__x, __y); + else if constexpr (sizeof(__x) == 8) { const auto __r128 = __vector_bitcast<_Tp, 16 / sizeof(_Tp)>(__x) != __vector_bitcast<_Tp, 16 / sizeof(_Tp)>(__y); _MaskMember<_Tp> __r64; __builtin_memcpy(&__r64._M_data, &__r128, sizeof(__r64)); return __r64; - } // }}} + } else return _Base::_S_not_equal_to(__x, __y); } @@ -2451,15 +2452,16 @@ template <typename _Abi, typename> else __assert_unreachable<_Tp>(); } // }}} - else if constexpr (!__builtin_is_constant_evaluated() // {{{ - && sizeof(__x) == 8) + else if (__builtin_is_constant_evaluated()) + return _Base::_S_less(__x, __y); + else if constexpr (sizeof(__x) == 8) { const auto __r128 = __vector_bitcast<_Tp, 16 / sizeof(_Tp)>(__x) < __vector_bitcast<_Tp, 16 / sizeof(_Tp)>(__y); _MaskMember<_Tp> __r64; __builtin_memcpy(&__r64._M_data, &__r128, sizeof(__r64)); return __r64; - } // }}} + } else return _Base::_S_less(__x, __y); } @@ -2558,15 +2560,16 @@ template <typename _Abi, typename> else __assert_unreachable<_Tp>(); } // }}} - else if constexpr (!__builtin_is_constant_evaluated() // {{{ - && sizeof(__x) == 8) + else if (__builtin_is_constant_evaluated()) + return _Base::_S_less_equal(__x, __y); + else if constexpr (sizeof(__x) == 8) { const auto __r128 = __vector_bitcast<_Tp, 16 / sizeof(_Tp)>(__x) <= __vector_bitcast<_Tp, 16 / sizeof(_Tp)>(__y); _MaskMember<_Tp> __r64; __builtin_memcpy(&__r64._M_data, &__r128, sizeof(__r64)); return __r64; - } // }}} + } else return _Base::_S_less_equal(__x, __y); } |