]> git.ipfire.org Git - thirdparty/gcc.git/commit
libstdc++: Fix up constexpr std::char_traits<char>::compare [PR99181]
authorJakub Jelinek <jakub@redhat.com>
Tue, 23 Feb 2021 08:30:18 +0000 (09:30 +0100)
committerJakub Jelinek <jakub@redhat.com>
Thu, 22 Apr 2021 14:32:43 +0000 (16:32 +0200)
commit21a7edf3a0cea656f2de834ea8320870496d5a2f
tree35b0d98c5ae5d791c3b2a04ea1ba3ce6e921bf6e
parenta1d1df435b9b9eb2e78f73ac2ab6558302cb1918
libstdc++: Fix up constexpr std::char_traits<char>::compare [PR99181]

Because of LWG 467, std::char_traits<char>::lt compares the values
cast to unsigned char rather than char, so even when char is signed
we get unsigned comparision.  std::char_traits<char>::compare uses
__builtin_memcmp and that works the same, but during constexpr evaluation
we were calling __gnu_cxx::char_traits<char_type>::compare.  As
char_traits::lt is not virtual, __gnu_cxx::char_traits<char_type>::compare
used __gnu_cxx::char_traits<char_type>::lt rather than
std::char_traits<char>::lt and thus compared chars as signed if char is
signed.
This change fixes it by inlining __gnu_cxx::char_traits<char_type>::compare
into std::char_traits<char>::compare by hand, so that it calls the right
lt method.

2021-02-23  Jakub Jelinek  <jakub@redhat.com>

PR libstdc++/99181
* include/bits/char_traits.h (char_traits<char>::compare): For
constexpr evaluation don't call
__gnu_cxx::char_traits<char_type>::compare but do the comparison loop
directly.

* testsuite/21_strings/char_traits/requirements/char/99181.cc: New
test.

(cherry picked from commit 311c57f6d8f285d69e44bf94152c753900cb1a0a)
libstdc++-v3/include/bits/char_traits.h
libstdc++-v3/testsuite/21_strings/char_traits/requirements/char/99181.cc [new file with mode: 0644]