public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Matthias Kretz <mkretz@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-9183] libstdc++: Fix incorrect __builtin_is_constant_evaluated calls
Date: Thu, 16 Feb 2023 21:04:20 +0000 (GMT) [thread overview]
Message-ID: <20230216210420.4C102385735E@sourceware.org> (raw)
https://gcc.gnu.org/g:16162ac2250943af3fa710496f066bf2af35ca9f
commit r12-9183-g16162ac2250943af3fa710496f066bf2af35ca9f
Author: Matthias Kretz <m.kretz@gsi.de>
Date: Thu Feb 2 12:29:33 2023 +0100
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.
(cherry picked from commit 1fd3836463c65f695831ef04c7dbda1e7a1794ba)
Diff:
---
libstdc++-v3/include/experimental/bits/simd_x86.h | 21 ++++++++++++---------
1 file 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 baa978bffda..c809520dcdd 100644
--- a/libstdc++-v3/include/experimental/bits/simd_x86.h
+++ b/libstdc++-v3/include/experimental/bits/simd_x86.h
@@ -2340,15 +2340,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);
}
@@ -2447,15 +2448,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);
}
@@ -2554,15 +2556,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);
}
reply other threads:[~2023-02-16 21:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230216210420.4C102385735E@sourceware.org \
--to=mkretz@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
--cc=libstdc++-cvs@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).