diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b96afe6a880..4ac1e7ff510 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2016-01-26 Jonathan Wakely + + PR libstdc++/69478 + * include/bits/stl_algobase.h (__copy_move<_IsMove, true, + random_access_iterator_tag>): Check is_move_assignable when moving. + (__copy_move_backwards<_IsMove, true, random_access_iterator_tag>): + Likewise. + * testsuite/25_algorithms/copy/move_iterators/69478.cc: New. + * testsuite/25_algorithms/copy_backward/move_iterators/69478.cc: New. + * testsuite/25_algorithms/move/69478.cc: New. + * testsuite/25_algorithms/move_backward/69478.cc: new. + 2016-01-26 Andris Pavenis * include/c_compatibility/stdlib.h: Include wide character related diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 4a618bebb9a..d95ea513a59 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -357,9 +357,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __copy_m(const _Tp* __first, const _Tp* __last, _Tp* __result) { #if __cplusplus >= 201103L + using __assignable = conditional<_IsMove, + is_move_assignable<_Tp>, + is_copy_assignable<_Tp>>; // trivial types can have deleted assignment - static_assert( is_copy_assignable<_Tp>::value, - "type is not assignable" ); + static_assert( __assignable::type::value, "type is not assignable" ); #endif const ptrdiff_t _Num = __last - __first; if (_Num) @@ -557,9 +559,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __copy_move_b(const _Tp* __first, const _Tp* __last, _Tp* __result) { #if __cplusplus >= 201103L + using __assignable = conditional<_IsMove, + is_move_assignable<_Tp>, + is_copy_assignable<_Tp>>; // trivial types can have deleted assignment - static_assert( is_copy_assignable<_Tp>::value, - "type is not assignable" ); + static_assert( __assignable::type::value, "type is not assignable" ); #endif const ptrdiff_t _Num = __last - __first; if (_Num) diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/69478.cc b/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/69478.cc new file mode 100644 index 00000000000..707b273c83e --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/69478.cc @@ -0,0 +1,40 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2016 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 +// . + +// PR libstdc++/69478 + +#include +#include + +void +test01() +{ + // A move-only type that is also a trivial class. + struct trivial_rvalstruct + { + trivial_rvalstruct() = default; + trivial_rvalstruct(trivial_rvalstruct&&) = default; + trivial_rvalstruct& operator=(trivial_rvalstruct&&) = default; + }; + static_assert(std::is_trivial::value, ""); + + trivial_rvalstruct a[1], b[1]; + copy(std::make_move_iterator(a), std::make_move_iterator(a + 1), b); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc new file mode 100644 index 00000000000..e00d146996f --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc @@ -0,0 +1,40 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2016 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 +// . + +// PR libstdc++/69478 + +#include +#include + +void +test01() +{ + // A move-only type that is also a trivial class. + struct trivial_rvalstruct + { + trivial_rvalstruct() = default; + trivial_rvalstruct(trivial_rvalstruct&&) = default; + trivial_rvalstruct& operator=(trivial_rvalstruct&&) = default; + }; + static_assert(std::is_trivial::value, ""); + + trivial_rvalstruct a[1], b[1]; + copy_backward(std::make_move_iterator(a), std::make_move_iterator(a+1), b); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/move/69478.cc b/libstdc++-v3/testsuite/25_algorithms/move/69478.cc new file mode 100644 index 00000000000..791e0bfcff6 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/move/69478.cc @@ -0,0 +1,40 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2016 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 +// . + +// PR libstdc++/69478 + +#include +#include + +void +test01() +{ + // A move-only type that is also a trivial class. + struct trivial_rvalstruct + { + trivial_rvalstruct() = default; + trivial_rvalstruct(trivial_rvalstruct&&) = default; + trivial_rvalstruct& operator=(trivial_rvalstruct&&) = default; + }; + static_assert(std::is_trivial::value, ""); + + trivial_rvalstruct a[1], b[1]; + std::move(a, a + 1, b); +} diff --git a/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc b/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc new file mode 100644 index 00000000000..8ca198fc2c1 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc @@ -0,0 +1,40 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2016 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 +// . + +// PR libstdc++/69478 + +#include +#include + +void +test01() +{ + // A move-only type that is also a trivial class. + struct trivial_rvalstruct + { + trivial_rvalstruct() = default; + trivial_rvalstruct(trivial_rvalstruct&&) = default; + trivial_rvalstruct& operator=(trivial_rvalstruct&&) = default; + }; + static_assert(std::is_trivial::value, ""); + + trivial_rvalstruct a[1], b[1]; + std::move_backward(a, a + 1, b); +}