public inbox for gcc-bugs@sourceware.org
help / color / mirror / Atom feed
From: "redi at gcc dot gnu.org" <gcc-bugzilla@gcc.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	[thread overview]
Message-ID: <bug-108846-4-0DWEcXAfZB@http.gcc.gnu.org/bugzilla/> (raw)
In-Reply-To: <bug-108846-4@http.gcc.gnu.org/bugzilla/>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108846

--- Comment #16 from Jonathan Wakely <redi at gcc dot gnu.org> ---
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 >= 201103L
-         using __assignable = __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 = __last - __first;
-         if (_Num)
+         if (__builtin_expect(_Num > 1, true))
            __builtin_memmove(__result, __first, sizeof(_Tp) * _Num);
+         else if (_Num == 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 >= 201103L
-         using __assignable = __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 = __last - __first;
-         if (_Num)
+         if (__builtin_expect(_Num > 1, true))
            __builtin_memmove(__result - _Num, __first, sizeof(_Tp) * _Num);
+         else if (_Num == 1)
+           return std::__copy_move_backward<_IsMove, false,
+                                            random_access_iterator_tag>::
+                    __copy_move_b(__first, __last, __result);
          return __result - _Num;
        }
     };

  parent reply	other threads:[~2023-02-25 14:13 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-18 21:22 [Bug libstdc++/108846] New: std::copy, std::copy_n " arthur.j.odwyer at gmail dot com
2023-02-18 21:55 ` [Bug libstdc++/108846] " pinskia at gcc dot gnu.org
2023-02-18 21:58 ` pinskia at gcc dot gnu.org
2023-02-18 22:00 ` pinskia at gcc dot gnu.org
2023-02-20  8:38 ` de34 at live dot cn
2023-02-20 23:42 ` dangelog at gmail dot com
2023-02-21  1:58 ` de34 at live dot cn
2023-02-21  7:21 ` [Bug libstdc++/108846] std::copy, std::copy_n and std::copy_backward " pinskia at gcc dot gnu.org
2023-02-23 17:20 ` redi at gcc dot gnu.org
2023-02-23 17:25 ` redi at gcc dot gnu.org
2023-02-23 17:27 ` redi at gcc dot gnu.org
2023-02-23 17:29 ` arthur.j.odwyer at gmail dot com
2023-02-24 19:31 ` dangelog at gmail dot com
2023-02-25  9:06 ` redi at gcc dot gnu.org
2023-02-25  9:07 ` redi at gcc dot gnu.org
2023-02-25 11:40 ` dangelog at gmail dot com
2023-02-25 14:13 ` redi at gcc dot gnu.org [this message]
2023-02-25 14:16 ` redi at gcc dot gnu.org
2023-02-25 14:19 ` redi at gcc dot gnu.org
2023-02-25 14:29 ` redi at gcc dot gnu.org
2023-02-28  9:50 ` cvs-commit at gcc dot gnu.org
2023-03-02 10:49 ` dangelog at gmail dot com
2023-03-02 11:19 ` redi at gcc dot gnu.org
2023-04-20 13:50 ` redi at gcc dot gnu.org
2023-04-20 14:12 ` arthur.j.odwyer at gmail dot com
2023-04-20 17:10 ` redi at gcc dot gnu.org
2023-04-20 17:11 ` redi at gcc dot gnu.org
2024-03-18 14:05 ` cvs-commit at gcc dot gnu.org
2024-03-18 14:13 ` redi at gcc dot gnu.org

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=bug-108846-4-0DWEcXAfZB@http.gcc.gnu.org/bugzilla/ \
    --to=gcc-bugzilla@gcc.gnu.org \
    --cc=gcc-bugs@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).