public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-8743] libstdc++: Avoid reusing moved-from iterators in PSTL tests [PR90276]
Date: Fri,  2 Feb 2024 10:27:33 +0000 (GMT)	[thread overview]
Message-ID: <20240202102733.81C94385803F@sourceware.org> (raw)

https://gcc.gnu.org/g:723a7c1ad29523b9ddff53c7b147bffea56fbb63

commit r14-8743-g723a7c1ad29523b9ddff53c7b147bffea56fbb63
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Jan 31 10:41:49 2024 +0000

    libstdc++: Avoid reusing moved-from iterators in PSTL tests [PR90276]
    
    The reverse_invoker utility for PSTL tests uses forwarding references for
    all parameters, but some of those parameters get forwarded to move
    constructors which then leave the objects in a moved-from state. When
    the parameters are forwarded a second time that results in making new
    copies of moved-from iterators.  For libstdc++ debug mode iterators, the
    moved-from state is singular, which means copying them will abort at
    runtime.
    
    The fix is to make copies of iterator arguments instead of forwarding
    them.
    
    The callers of reverse_invoker::operator() also forward the iterators
    multiple times, but that's OK because reverse_invoker accepts them by
    forwarding reference but then breaks the chain of forwarding and copies
    them as lvalues.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/90276
            * testsuite/util/pstl/test_utils.h (reverse_invoker): Do not use
            perfect forwarding for iterator arguments.

Diff:
---
 libstdc++-v3/testsuite/util/pstl/test_utils.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libstdc++-v3/testsuite/util/pstl/test_utils.h b/libstdc++-v3/testsuite/util/pstl/test_utils.h
index ed6d48b9471a..e35084eabb20 100644
--- a/libstdc++-v3/testsuite/util/pstl/test_utils.h
+++ b/libstdc++-v3/testsuite/util/pstl/test_utils.h
@@ -1083,18 +1083,18 @@ struct iterator_invoker<std::forward_iterator_tag, /*isReverse=*/std::true_type>
 template <typename IsReverse>
 struct reverse_invoker
 {
-    template <typename... Rest>
+    template <typename Policy, typename Op, typename... Rest>
     void
-    operator()(Rest&&... rest)
+    operator()(Policy&& exec, Op op, Rest&&... rest)
     {
         // Random-access iterator
-        iterator_invoker<std::random_access_iterator_tag, IsReverse>()(std::forward<Rest>(rest)...);
+        iterator_invoker<std::random_access_iterator_tag, IsReverse>()(std::forward<Policy>(exec), op, rest...);
 
         // Forward iterator
-        iterator_invoker<std::forward_iterator_tag, IsReverse>()(std::forward<Rest>(rest)...);
+        iterator_invoker<std::forward_iterator_tag, IsReverse>()(std::forward<Policy>(exec), op, rest...);
 
         // Bidirectional iterator
-        iterator_invoker<std::bidirectional_iterator_tag, IsReverse>()(std::forward<Rest>(rest)...);
+        iterator_invoker<std::bidirectional_iterator_tag, IsReverse>()(std::forward<Policy>(exec), op, rest...);
     }
 };

                 reply	other threads:[~2024-02-02 10:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20240202102733.81C94385803F@sourceware.org \
    --to=redi@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).