public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc(refs/users/aoliva/heads/testme)] use internal wcs* as fallback
Date: Fri, 15 Jan 2021 16:37:11 +0000 (GMT) [thread overview]
Message-ID: <20210115163711.51FC939874D6@sourceware.org> (raw)
https://gcc.gnu.org/g:2c013c757c631c21281305a3d1b8b3cb195d781d
commit 2c013c757c631c21281305a3d1b8b3cb195d781d
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Jan 14 19:25:36 2021 -0300
use internal wcs* as fallback
Diff:
---
libstdc++-v3/include/bits/char_traits.h | 56 +++++++++++++++------------------
1 file changed, 26 insertions(+), 30 deletions(-)
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index ea1e036f721..3a60478ea32 100644
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -438,7 +438,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
-#ifdef _GLIBCXX_USE_WCHAR_T
+#ifdef __SIZEOF_WCHAR_T__
/// 21.1.3.2 char_traits specializations
template<>
struct char_traits<wchar_t>
@@ -469,23 +469,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
if (__n == 0)
return 0;
-#if __cplusplus >= 201703L
- if (__builtin_constant_p(__n)
- && __constant_char_array_p(__s1, __n)
- && __constant_char_array_p(__s2, __n))
- return __gnu_cxx::char_traits<char_type>::compare(__s1, __s2, __n);
+#ifdef _GLIBCXX_USE_WCHAR_T
+ if (!__builtin_is_constant_evaluated())
+ return wmemcmp(__s1, __s2, __n);
#endif
- return wmemcmp(__s1, __s2, __n);
+ return __gnu_cxx::char_traits<char_type>::compare(__s1, __s2, __n);
}
static _GLIBCXX17_CONSTEXPR size_t
length(const char_type* __s)
{
-#if __cplusplus >= 201703L
- if (__constant_string_p(__s))
- return __gnu_cxx::char_traits<char_type>::length(__s);
+#ifdef _GLIBCXX_USE_WCHAR_T
+ if (!__builtin_is_constant_evaluated())
+ return wcslen(__s);
#endif
- return wcslen(__s);
+ return __gnu_cxx::char_traits<char_type>::length(__s);
}
static _GLIBCXX17_CONSTEXPR const char_type*
@@ -493,13 +491,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
if (__n == 0)
return 0;
-#if __cplusplus >= 201703L
- if (__builtin_constant_p(__n)
- && __builtin_constant_p(__a)
- && __constant_char_array_p(__s, __n))
- return __gnu_cxx::char_traits<char_type>::find(__s, __n, __a);
+#ifdef _GLIBCXX_USE_WCHAR_T
+ if (!__builtin_is_constant_evaluated())
+ return wmemchr(__s, __a, __n);
#endif
- return wmemchr(__s, __a, __n);
+ return __gnu_cxx::char_traits<char_type>::find(__s, __n, __a);
}
static _GLIBCXX20_CONSTEXPR char_type*
@@ -507,11 +503,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
if (__n == 0)
return __s1;
-#ifdef __cpp_lib_is_constant_evaluated
- if (std::is_constant_evaluated())
- return __gnu_cxx::char_traits<char_type>::move(__s1, __s2, __n);
+#ifdef _GLIBCXX_USE_WCHAR_T
+ if (!__builtin_is_constant_evaluated())
+ return wmemmove(__s1, __s2, __n);
#endif
- return wmemmove(__s1, __s2, __n);
+ return __gnu_cxx::char_traits<char_type>::move(__s1, __s2, __n);
}
static _GLIBCXX20_CONSTEXPR char_type*
@@ -519,11 +515,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
if (__n == 0)
return __s1;
-#ifdef __cpp_lib_is_constant_evaluated
- if (std::is_constant_evaluated())
- return __gnu_cxx::char_traits<char_type>::copy(__s1, __s2, __n);
+#ifdef _GLIBCXX_USE_WCHAR_T
+ if (!__builtin_is_constant_evaluated())
+ return wmemcpy(__s1, __s2, __n);
#endif
- return wmemcpy(__s1, __s2, __n);
+ return __gnu_cxx::char_traits<char_type>::copy(__s1, __s2, __n);
}
static _GLIBCXX20_CONSTEXPR char_type*
@@ -531,11 +527,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
if (__n == 0)
return __s;
-#ifdef __cpp_lib_is_constant_evaluated
- if (std::is_constant_evaluated())
- return __gnu_cxx::char_traits<char_type>::assign(__s, __n, __a);
+#ifdef _GLIBCXX_USE_WCHAR_T
+ if (!__builtin_is_constant_evaluated())
+ return wmemset(__s, __a, __n);
#endif
- return wmemset(__s, __a, __n);
+ return __gnu_cxx::char_traits<char_type>::assign(__s, __n, __a);
}
static _GLIBCXX_CONSTEXPR char_type
@@ -558,7 +554,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
not_eof(const int_type& __c) _GLIBCXX_NOEXCEPT
{ return eq_int_type(__c, eof()) ? 0 : __c; }
};
-#endif //_GLIBCXX_USE_WCHAR_T
+#endif // __SIZEOF_WCHAR_T__
#ifdef _GLIBCXX_USE_CHAR8_T
template<>
next reply other threads:[~2021-01-15 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 16:37 Alexandre Oliva [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-14 22:27 Alexandre Oliva
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=20210115163711.51FC939874D6@sourceware.org \
--to=aoliva@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).