[gcc r13-9123] libstdc++: Use std::move for iterator in ranges::fill [PR117094]
Jonathan Wakely
redi@gcc.gnu.org
Thu Oct 17 14:11:45 GMT 2024
https://gcc.gnu.org/g:360db9ef594e7acaef5e9a19ad4208e8c122d822
commit r13-9123-g360db9ef594e7acaef5e9a19ad4208e8c122d822
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Sun Oct 13 22:48:43 2024 +0100
libstdc++: Use std::move for iterator in ranges::fill [PR117094]
Input iterators aren't required to be copyable.
libstdc++-v3/ChangeLog:
PR libstdc++/117094
* include/bits/ranges_algobase.h (__fill_fn): Use std::move for
iterator that might not be copyable.
* testsuite/25_algorithms/fill/constrained.cc: Check
non-copyable iterator with sized sentinel.
(cherry picked from commit 03623fa91ff36ecb9faa3b55f7842a39b759594e)
Diff:
---
libstdc++-v3/include/bits/ranges_algobase.h | 2 +-
.../testsuite/25_algorithms/fill/constrained.cc | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/bits/ranges_algobase.h b/libstdc++-v3/include/bits/ranges_algobase.h
index 5b90f437530b..c48d36bb79e9 100644
--- a/libstdc++-v3/include/bits/ranges_algobase.h
+++ b/libstdc++-v3/include/bits/ranges_algobase.h
@@ -567,7 +567,7 @@ namespace ranges
if constexpr (sized_sentinel_for<_Sent, _Out>)
{
const auto __len = __last - __first;
- return ranges::fill_n(__first, __len, __value);
+ return ranges::fill_n(std::move(__first), __len, __value);
}
else if constexpr (is_scalar_v<_Tp>)
{
diff --git a/libstdc++-v3/testsuite/25_algorithms/fill/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/fill/constrained.cc
index fe8683968953..074cc0d1bb7f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/fill/constrained.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/fill/constrained.cc
@@ -84,9 +84,43 @@ test02()
return ok;
}
+void
+test03()
+{
+ // Bug libstdc++/117094 - ranges::fill misses std::move for output_iterator
+
+ // Move-only output iterator
+ struct Iterator
+ {
+ using difference_type = long;
+ Iterator(int* p) : p(p) { }
+ Iterator(Iterator&&) = default;
+ Iterator& operator=(Iterator&&) = default;
+ int& operator*() const { return *p; }
+ Iterator& operator++() { ++p; return *this; }
+ Iterator operator++(int) { return Iterator(p++ ); }
+ int* p;
+
+ struct Sentinel
+ {
+ const int* p;
+ bool operator==(const Iterator& i) const { return p == i.p; }
+ long operator-(const Iterator& i) const { return p - i.p; }
+ };
+
+ long operator-(Sentinel s) const { return p - s.p; }
+ };
+ static_assert(std::sized_sentinel_for<Iterator::Sentinel, Iterator>);
+ int a[2];
+ std::ranges::fill(Iterator(a), Iterator::Sentinel{a+2}, 999);
+ VERIFY( a[0] == 999 );
+ VERIFY( a[1] == 999 );
+}
+
int
main()
{
test01();
static_assert(test02());
+ test03();
}
More information about the Libstdc++-cvs
mailing list