From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 22A053857BA8; Fri, 5 Jan 2024 10:23:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22A053857BA8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704450238; bh=WROF3G1bx1yZtlCvjx6jB6eQqiep9+LyJvssoabwQB4=; h=From:To:Subject:Date:From; b=dPaITyOk8bqcVVgVWKpbhS4E8hwJyMGjEcza3khLHcAFpwtM75FyU9R+Dab3ANl/p CRlelRApPJtrlGf9yGqqO0GktOc5MsiR9i35PARL06RTDo348KRHDy1/xGm+YdW2VI yfdnO2bNbcBnG8VpL7A2SiXqDky7GcSxWRQCoPdU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-6944] libstdc++: Fix std::char_traits::move [PR113200] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 2cb3d42d3f3e7a5345ee7a6f3676a10c84864d72 X-Git-Newrev: 15cc291887dc9dd92b2c93f4545e20eb6c190122 Message-Id: <20240105102358.22A053857BA8@sourceware.org> Date: Fri, 5 Jan 2024 10:23:58 +0000 (GMT) List-Id: https://gcc.gnu.org/g:15cc291887dc9dd92b2c93f4545e20eb6c190122 commit r14-6944-g15cc291887dc9dd92b2c93f4545e20eb6c190122 Author: Jonathan Wakely Date: Wed Jan 3 15:01:09 2024 +0000 libstdc++: Fix std::char_traits::move [PR113200] The current constexpr implementation of std::char_traits::move relies on being able to compare the pointer parameters, which is not allowed for unrelated pointers. We can use __builtin_constant_p to determine whether it's safe to compare the pointers directly. If not, then we know the ranges must be disjoint and so we can use char_traits::copy to copy forwards from the first character to the last. If the pointers can be compared directly, then we can simplify the condition for copying backwards to just two pointer comparisons. libstdc++-v3/ChangeLog: PR libstdc++/113200 * include/bits/char_traits.h (__gnu_cxx::char_traits::move): Use __builtin_constant_p to check for unrelated pointers that cannot be compared during constant evaluation. * testsuite/21_strings/char_traits/requirements/113200.cc: New test. Diff: --- libstdc++-v3/include/bits/char_traits.h | 16 +++------------- .../21_strings/char_traits/requirements/113200.cc | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 018eac28d0d..3074e9bb77e 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -227,19 +227,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >= 202002L if (std::__is_constant_evaluated()) { - if (__s1 == __s2) // unlikely, but saves a lot of work - return __s1; - const auto __end = __s2 + __n - 1; - bool __overlap = false; - for (std::size_t __i = 0; __i < __n - 1; ++__i) - { - if (__s1 + __i == __end) - { - __overlap = true; - break; - } - } - if (__overlap) + // Use __builtin_constant_p to avoid comparing unrelated pointers. + if (__builtin_constant_p(__s2 < __s1) + && __s1 > __s2 && __s1 < (__s2 + __n)) { do { diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/113200.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/113200.cc new file mode 100644 index 00000000000..0fe765d53bc --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/113200.cc @@ -0,0 +1,20 @@ +// { dg-do compile { target c++20 } } + +// PR libstdc++/113200 +// char_traits::move is not constexpr when the argument is a string literal + +#include + +template struct S +{ + char data_[ N ]; + + constexpr S( char const* p ): data_{} + { + std::char_traits::move( data_, p, N ); + } +}; + +template S( char const(&)[N] ) -> S; + +constexpr S s( "test" );