[PATCH] libstdc++: Fix LWG issues 3389 and 3390
Patrick Palka
ppalka@redhat.com
Tue Feb 11 15:54:00 GMT 2020
libstdc++-v3/ChangeLog:
DR 3389 and DR 3390
* include/bits/stl_iterator.h (move_move_iterator): Use std::move when
constructing the move_iterator with __i.
(counted_iterator::counted_iterator): Use std::move when initializing
M_current with __i.
* testsuite/24_iterators/counted_iterator/dr3389.cc: New test.
* testsuite/24_iterators/move_iterator/dr3390.cc: New test.
---
libstdc++-v3/include/bits/stl_iterator.h | 4 +-
.../24_iterators/counted_iterator/dr3389.cc | 66 +++++++++++++++++++
.../24_iterators/move_iterator/dr3390.cc | 66 +++++++++++++++++++
3 files changed, 134 insertions(+), 2 deletions(-)
create mode 100644 libstdc++-v3/testsuite/24_iterators/counted_iterator/dr3389.cc
create mode 100644 libstdc++-v3/testsuite/24_iterators/move_iterator/dr3390.cc
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 4e70672924b..fc9d442b475 100644
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -1375,7 +1375,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Iterator>
inline _GLIBCXX17_CONSTEXPR move_iterator<_Iterator>
make_move_iterator(_Iterator __i)
- { return move_iterator<_Iterator>(__i); }
+ { return move_iterator<_Iterator>(std::move(__i)); }
template<typename _Iterator, typename _ReturnType
= typename conditional<__move_if_noexcept_cond
@@ -1782,7 +1782,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr
counted_iterator(_It __i, iter_difference_t<_It> __n)
- : _M_current(__i), _M_length(__n)
+ : _M_current(std::move(__i)), _M_length(__n)
{ __glibcxx_assert(__n >= 0); }
template<typename _It2>
diff --git a/libstdc++-v3/testsuite/24_iterators/counted_iterator/dr3389.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/dr3389.cc
new file mode 100644
index 00000000000..c72317407cd
--- /dev/null
+++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/dr3389.cc
@@ -0,0 +1,66 @@
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do compile { target c++2a } }
+
+#include <iterator>
+
+#include <testsuite_iterators.h>
+
+using __gnu_test::test_range;
+using __gnu_test::input_iterator_wrapper;
+
+template<typename T>
+struct move_only_wrapper : input_iterator_wrapper<T>
+{
+ using input_iterator_wrapper<T>::input_iterator_wrapper;
+
+ move_only_wrapper()
+ : input_iterator_wrapper<T>(nullptr, nullptr)
+ { }
+
+ move_only_wrapper(const move_only_wrapper&) = delete;
+ move_only_wrapper&
+ operator=(const move_only_wrapper&) = delete;
+
+ move_only_wrapper(move_only_wrapper&&) = default;
+ move_only_wrapper&
+ operator=(move_only_wrapper&&) = default;
+
+ using input_iterator_wrapper<T>::operator++;
+
+ move_only_wrapper&
+ operator++()
+ {
+ input_iterator_wrapper<T>::operator++();
+ return *this;
+ }
+};
+
+static_assert(std::input_iterator<move_only_wrapper<int>>);
+static_assert(!std::forward_iterator<move_only_wrapper<int>>);
+static_assert(!std::copyable<move_only_wrapper<int>>);
+
+// DR 3390
+void
+test01()
+{
+ int x[] = {1,2,3,4};
+ test_range<int, move_only_wrapper> rx(x);
+ auto it = std::counted_iterator(rx.begin(), 2);
+}
diff --git a/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3390.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3390.cc
new file mode 100644
index 00000000000..100d68c1d5e
--- /dev/null
+++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/dr3390.cc
@@ -0,0 +1,66 @@
+// Copyright (C) 2020 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do compile { target c++2a } }
+
+#include <iterator>
+
+#include <testsuite_iterators.h>
+
+using __gnu_test::test_range;
+using __gnu_test::input_iterator_wrapper;
+
+template<typename T>
+struct move_only_wrapper : input_iterator_wrapper<T>
+{
+ using input_iterator_wrapper<T>::input_iterator_wrapper;
+
+ move_only_wrapper()
+ : input_iterator_wrapper<T>(nullptr, nullptr)
+ { }
+
+ move_only_wrapper(const move_only_wrapper&) = delete;
+ move_only_wrapper&
+ operator=(const move_only_wrapper&) = delete;
+
+ move_only_wrapper(move_only_wrapper&&) = default;
+ move_only_wrapper&
+ operator=(move_only_wrapper&&) = default;
+
+ using input_iterator_wrapper<T>::operator++;
+
+ move_only_wrapper&
+ operator++()
+ {
+ input_iterator_wrapper<T>::operator++();
+ return *this;
+ }
+};
+
+static_assert(std::input_iterator<move_only_wrapper<int>>);
+static_assert(!std::forward_iterator<move_only_wrapper<int>>);
+static_assert(!std::copyable<move_only_wrapper<int>>);
+
+// DR 3390
+void
+test01()
+{
+ int x[] = {1,2,3,4};
+ test_range<int, move_only_wrapper> rx(x);
+ auto it = std::make_move_iterator(rx.begin());
+}
--
2.25.0.191.gde93cc14ab
More information about the Gcc-patches
mailing list