aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2024-01-31 10:41:49 +0000
committerJonathan Wakely <jwakely@redhat.com>2024-02-02 10:27:16 +0000
commit723a7c1ad29523b9ddff53c7b147bffea56fbb63 (patch)
tree8eb2dcf14cce493ae1e10d3193d578d930f5dd49
parenta8f335ccb61bf6105192a4197ef2d84900614dc1 (diff)
downloadgcc-723a7c1ad29523b9ddff53c7b147bffea56fbb63.zip
gcc-723a7c1ad29523b9ddff53c7b147bffea56fbb63.tar.gz
gcc-723a7c1ad29523b9ddff53c7b147bffea56fbb63.tar.bz2
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.
-rw-r--r--libstdc++-v3/testsuite/util/pstl/test_utils.h10
1 files 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 ed6d48b..e35084e 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...);
}
};