From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 6087B386181F; Mon, 29 Mar 2021 20:03:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6087B386181F 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 r10-9600] libstdc++: Fix char_traits move with overlap X-Act-Checkin: gcc X-Git-Author: Paul Keir X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: affd2cfda6d5dd31331644ead9af191b4918cc94 X-Git-Newrev: 253751d1115710f5f150656fb13705282076a987 Message-Id: <20210329200357.6087B386181F@sourceware.org> Date: Mon, 29 Mar 2021 20:03:57 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 20:03:57 -0000 https://gcc.gnu.org/g:253751d1115710f5f150656fb13705282076a987 commit r10-9600-g253751d1115710f5f150656fb13705282076a987 Author: Paul Keir Date: Mon Jun 15 14:31:26 2020 +0100 libstdc++: Fix char_traits move with overlap Upon constexpr evaluation, char_traits move uses copy_backward, but its last argument should be to the range end rather than its beginning. 2020-06-12 Paul Keir * include/bits/char_traits.h (char_traits::move): constexpr move with overlap was using copy_backward incorrectly. * testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc: New test. (cherry picked from commit eb11134d0c4e4db623aefe433c9613632ef8618e) Diff: --- libstdc++-v3/include/bits/char_traits.h | 2 +- .../requirements/constexpr_functions_c++20.cc | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index b487476b092..c798f844a73 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -196,7 +196,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (std::is_constant_evaluated()) { if (__s1 > __s2 && __s1 < __s2 + __n) - std::copy_backward(__s2, __s2 + __n, __s1); + std::copy_backward(__s2, __s2 + __n, __s1 + __n); else std::copy(__s2, __s2 + __n, __s1); return __s1; diff --git a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc new file mode 100644 index 00000000000..63c7c9cbb57 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/constexpr_functions_c++20.cc @@ -0,0 +1,52 @@ +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +// Copyright (C) 2017-2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include + +template + constexpr bool + test_move() + { + using char_type = typename CT::char_type; + char_type s1[3] = {1, 2, 3}; + CT::move(s1+1, s1, 2); + return s1[0]==char_type{1} && s1[1]==char_type{1} && s1[2]==char_type{2}; + } + +#ifndef __cpp_lib_constexpr_char_traits +# error Feature-test macro for constexpr char_traits is missing +#elif __cpp_lib_constexpr_char_traits != 201811 +# error Feature-test macro for constexpr char_traits has the wrong value +#endif + +static_assert( test_move>() ); +#ifdef _GLIBCXX_USE_WCHAR_T +static_assert( test_move>() ); +#endif +#ifdef _GLIBCXX_USE_CHAR8_T +static_assert( test_move>() ); +#endif +static_assert( test_move>() ); +static_assert( test_move>() ); + +struct C { unsigned char c; }; +constexpr bool operator==(const C& c1, const C& c2) { return c1.c == c2.c; } +constexpr bool operator<(const C& c1, const C& c2) { return c1.c < c2.c; } +static_assert( test_move>() );