Fix assertions for move assignment of trivial types

Backport from mainline
2016-01-26  Jonathan Wakely  <jwakely@redhat.com>

	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.

From-SVN: r235285

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1a23632d338aa687abf47584829a9b699f330d50..4bdba8d002b888166e52cdc2c194ed7929ad0455 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,18 @@
 2016-04-20  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2016-01-26  Jonathan Wakely  <jwakely@redhat.com>
+
+       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.
+
        Backport from mainline
        2016-04-05  Jonathan Wakely  <jwakely@redhat.com>
 

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index a8d3cc89ee3f12b55e796e322190dc6bb57ac69b..ef01ebad8c7f03e8975c26090b6068565571983f 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -369,9 +369,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)
@@ -569,9 +571,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 (file)
index 0000000..707b273
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// PR libstdc++/69478
+
+#include <algorithm>
+#include <iterator>
+
+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<trivial_rvalstruct>::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 (file)
index 0000000..e00d146
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// PR libstdc++/69478
+
+#include <algorithm>
+#include <iterator>
+
+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<trivial_rvalstruct>::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 (file)
index 0000000..791e0bf
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// PR libstdc++/69478
+
+#include <algorithm>
+#include <iterator>
+
+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<trivial_rvalstruct>::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 (file)
index 0000000..8ca198f
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// PR libstdc++/69478
+
+#include <algorithm>
+#include <iterator>
+
+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<trivial_rvalstruct>::value, "");
+
+  trivial_rvalstruct a[1], b[1];
+  std::move_backward(a, a + 1, b);
+}