From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 48) id E8C76385781A; Sat, 25 Feb 2023 14:13:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E8C76385781A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677334427; bh=v/nLg1wq5vaIUqedd4ou6Uc0ZQsg8jMejFTM670W4ok=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZtGI8AkVX5QQ9jzG01O+ygPk6m6084JBw+xQtQTXUa3vNrXVEix9g++4eSkqTYU69 wDc0r6QR97vNyGdVghqRNOwmF8xWMYg8odIbS/o3swG/jit0xOmHVkCeY/PjyD8tYW ra9eqtJUMsCuYEj8B97WeKdfqQM2h7hqAfoJLuKQ= From: "redi at gcc dot gnu.org" To: gcc-bugs@gcc.gnu.org Subject: [Bug libstdc++/108846] std::copy, std::copy_n and std::copy_backward on potentially overlapping subobjects Date: Sat, 25 Feb 2023 14:13:47 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: gcc X-Bugzilla-Component: libstdc++ X-Bugzilla-Version: 13.0 X-Bugzilla-Keywords: ABI X-Bugzilla-Severity: normal X-Bugzilla-Who: redi at gcc dot gnu.org X-Bugzilla-Status: NEW X-Bugzilla-Resolution: X-Bugzilla-Priority: P3 X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 List-Id: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D108846 --- Comment #16 from Jonathan Wakely --- Ah gotcha. So then something like this (untested): --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -422,16 +422,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static _Tp* __copy_m(const _Tp* __first, const _Tp* __last, _Tp* __result) { -#if __cplusplus >=3D 201103L - using __assignable =3D __conditional_t<_IsMove, - is_move_assignable<_Tp>, - is_copy_assignable<_Tp>>; - // trivial types can have deleted assignment - static_assert( __assignable::value, "type must be assignable" ); -#endif const ptrdiff_t _Num =3D __last - __first; - if (_Num) + if (__builtin_expect(_Num > 1, true)) __builtin_memmove(__result, __first, sizeof(_Tp) * _Num); + else if (_Num =3D=3D 1) + return std::__copy_move<_IsMove, false, + random_access_iterator_tag>:: + __copy_m(__first, __last, __result); return __result + _Num; } }; @@ -737,16 +734,13 @@ _GLIBCXX_END_NAMESPACE_CONTAINER static _Tp* __copy_move_b(const _Tp* __first, const _Tp* __last, _Tp* __result) { -#if __cplusplus >=3D 201103L - using __assignable =3D __conditional_t<_IsMove, - is_move_assignable<_Tp>, - is_copy_assignable<_Tp>>; - // trivial types can have deleted assignment - static_assert( __assignable::value, "type must be assignable" ); -#endif const ptrdiff_t _Num =3D __last - __first; - if (_Num) + if (__builtin_expect(_Num > 1, true)) __builtin_memmove(__result - _Num, __first, sizeof(_Tp) * _Num); + else if (_Num =3D=3D 1) + return std::__copy_move_backward<_IsMove, false, + random_access_iterator_tag>:: + __copy_move_b(__first, __last, __result); return __result - _Num; } };=