public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Tamar Christina <tnfchris@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/ARM/heads/arm-perf-staging)] libstdc++: Fix LWG issues 3389 and 3390 Date: Fri, 17 Jul 2020 13:02:15 +0000 (GMT) [thread overview] Message-ID: <20200717130215.4EF8F399D021@sourceware.org> (raw) https://gcc.gnu.org/g:99bbab9f77424c6387e7dfcba5c62937a8cff841 commit 99bbab9f77424c6387e7dfcba5c62937a8cff841 Author: Patrick Palka <ppalka@redhat.com> Date: Tue Feb 11 10:45:26 2020 -0500 libstdc++: Fix LWG issues 3389 and 3390 libstdc++-v3/ChangeLog: LWG 3389 and LWG 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/lwg3389.cc: New test. * testsuite/24_iterators/move_iterator/lwg3390.cc: New test. Diff: --- libstdc++-v3/ChangeLog | 10 ++++ libstdc++-v3/include/bits/stl_iterator.h | 4 +- .../24_iterators/counted_iterator/lwg3389.cc | 66 ++++++++++++++++++++++ .../24_iterators/move_iterator/lwg3390.cc | 66 ++++++++++++++++++++++ 4 files changed, 144 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 922c715c838..cc4cfb7da0f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2020-02-12 Patrick Palka <ppalka@redhat.com> + + LWG 3389 and LWG 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/lwg3389.cc: New test. + * testsuite/24_iterators/move_iterator/lwg3390.cc: New test. + 2020-02-12 Sandra Loosemore <sandra@codesourcery.com> PR libstdc++/79193 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/lwg3389.cc b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3389.cc new file mode 100644 index 00000000000..cf74fd47bec --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/counted_iterator/lwg3389.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>>); + +// LWG 3389 +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/lwg3390.cc b/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.cc new file mode 100644 index 00000000000..1df7caccece --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/move_iterator/lwg3390.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>>); + +// LWG 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()); +}
reply other threads:[~2020-07-17 13:02 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200717130215.4EF8F399D021@sourceware.org \ --to=tnfchris@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).