]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Use ranges::iter_move in ranges::unique [PR120789]
authorPatrick Palka <ppalka@redhat.com>
Tue, 1 Jul 2025 17:43:09 +0000 (13:43 -0400)
committerPatrick Palka <ppalka@redhat.com>
Tue, 1 Jul 2025 17:43:09 +0000 (13:43 -0400)
PR libstdc++/120789

libstdc++-v3/ChangeLog:

* include/bits/ranges_algo.h (__unique_fn::operator()): Use
ranges::iter_move(iter) instead of std::move(*iter).
* testsuite/25_algorithms/unique/120789.cc: New test.

Reviewed-by: Tomasz KamiƄski <tkaminsk@redhat.com>
Reviewed-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/include/bits/ranges_algo.h
libstdc++-v3/testsuite/25_algorithms/unique/120789.cc [new file with mode: 0644]

index 2df730eabc8b03a5d8f0a314ab7edea748450780..7aea5c9fa70cc0b88656ac5a7c6e98fc50df14f3 100644 (file)
@@ -1454,7 +1454,7 @@ namespace ranges
          if (!std::__invoke(__comp,
                             std::__invoke(__proj, *__dest),
                             std::__invoke(__proj, *__first)))
-           *++__dest = std::move(*__first);
+           *++__dest = ranges::iter_move(__first);
        return {++__dest, __first};
       }
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/120789.cc b/libstdc++-v3/testsuite/25_algorithms/unique/120789.cc
new file mode 100644 (file)
index 0000000..24b1071
--- /dev/null
@@ -0,0 +1,36 @@
+// PR libstdc++/120789 - ranges::unique should use ranges::iter_move
+// { dg-do compile { target c++20 } }
+
+#include <algorithm>
+
+struct A
+{
+  bool operator==(const A&) const;
+};
+
+struct B
+{
+  B(B&&) = delete;
+  B& operator=(const A&) const;
+
+  operator A() const;
+  bool operator==(const B&) const;
+};
+
+struct I
+{
+  using value_type = A;
+  using difference_type = int;
+  B operator*() const;
+  I& operator++();
+  I operator++(int);
+  bool operator==(const I&) const;
+  friend A iter_move(const I&);
+};
+
+void
+test01()
+{
+  std::ranges::subrange<I, I> r;
+  auto [begin, end] = std::ranges::unique(r);
+}