From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 81C94385803F; Fri, 2 Feb 2024 10:27:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81C94385803F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1706869653; bh=uxY+ewpJKqovYoUsad6VETMLp/6NhvpLUt+a+BgKfFw=; h=From:To:Subject:Date:From; b=oqkZpyUqGBUgCJS1kDQk9HMfj3Awg6yGGZbXjksdMmz3Afa+YWwUsE1XTBWk5a34F kLkLamoc54qftBesrl3PaDbRuARVXOeCUyKZYE/0MKLnOXwqlzwAUXoiJNZ8o4zfRF lbHRe8AlhHRRznheQCGOZWfoKGG5zeXrCYcQDrg8= 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-8743] libstdc++: Avoid reusing moved-from iterators in PSTL tests [PR90276] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: a8f335ccb61bf6105192a4197ef2d84900614dc1 X-Git-Newrev: 723a7c1ad29523b9ddff53c7b147bffea56fbb63 Message-Id: <20240202102733.81C94385803F@sourceware.org> Date: Fri, 2 Feb 2024 10:27:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:723a7c1ad29523b9ddff53c7b147bffea56fbb63 commit r14-8743-g723a7c1ad29523b9ddff53c7b147bffea56fbb63 Author: Jonathan Wakely 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 template struct reverse_invoker { - template + template void - operator()(Rest&&... rest) + operator()(Policy&& exec, Op op, Rest&&... rest) { // Random-access iterator - iterator_invoker()(std::forward(rest)...); + iterator_invoker()(std::forward(exec), op, rest...); // Forward iterator - iterator_invoker()(std::forward(rest)...); + iterator_invoker()(std::forward(exec), op, rest...); // Bidirectional iterator - iterator_invoker()(std::forward(rest)...); + iterator_invoker()(std::forward(exec), op, rest...); } };