+2013-11-09 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ PR libstdc++/58982
+ * include/bits/stl_algobase.h (__copy_move::__copy_m): Use assertion
+ to prevent using memmove() on non-assignable types.
+ (__copy_move_backward::__copy_move_b): Likewise.
+ * include/bits/stl_uninitialized.h (uninitialized_copy
+ uninitialized_copy_n, uninitialized_fill, uninitialized_fill_n,
+ __uninitialized_default, __uninitialized_default_n): Check for
+ assignable as well as trivial.
+ * testsuite/20_util/specialized_algorithms/uninitialized_copy/
+ 58982.cc: New.
+ * testsuite/20_util/specialized_algorithms/uninitialized_copy_n/
+ 58982.cc: New.
+ * testsuite/20_util/specialized_algorithms/uninitialized_fill/
+ 58982.cc: New.
+ * testsuite/20_util/specialized_algorithms/uninitialized_fill_n/
+ 58982.cc: New.
+ * testsuite/25_algorithms/copy/58982.cc: New.
+ * testsuite/25_algorithms/copy_n/58982.cc: New.
+
2013-11-08 François Dumont <fdumont@gcc.gnu.org>
* include/debug/safe_iterator.h (_BeforeBeginHelper<>::_S_Is):
static _Tp*
__copy_m(const _Tp* __first, const _Tp* __last, _Tp* __result)
{
+#if __cplusplus >= 201103L
+ // trivial types can have deleted assignment
+ static_assert( is_copy_assignable<_Tp>::value,
+ "type is not assignable" );
+#endif
const ptrdiff_t _Num = __last - __first;
if (_Num)
__builtin_memmove(__result, __first, sizeof(_Tp) * _Num);
static _Tp*
__copy_move_b(const _Tp* __first, const _Tp* __last, _Tp* __result)
{
+#if __cplusplus >= 201103L
+ // trivial types can have deleted assignment
+ static_assert( is_copy_assignable<_Tp>::value,
+ "type is not assignable" );
+#endif
const ptrdiff_t _Num = __last - __first;
if (_Num)
__builtin_memmove(__result - _Num, __first, sizeof(_Tp) * _Num);
_ValueType1;
typedef typename iterator_traits<_ForwardIterator>::value_type
_ValueType2;
+#if __cplusplus < 201103L
+ const bool __assignable = true;
+#else
+ // trivial types can have deleted assignment
+ typedef typename iterator_traits<_InputIterator>::reference _RefType;
+ const bool __assignable = is_assignable<_ValueType1, _RefType>::value;
+#endif
- return std::__uninitialized_copy<(__is_trivial(_ValueType1)
- && __is_trivial(_ValueType2))>::
+ return std::__uninitialized_copy<__is_trivial(_ValueType1)
+ && __is_trivial(_ValueType2)
+ && __assignable>::
__uninit_copy(__first, __last, __result);
}
{
typedef typename iterator_traits<_ForwardIterator>::value_type
_ValueType;
+#if __cplusplus < 201103L
+ const bool __assignable = true;
+#else
+ // trivial types can have deleted assignment
+ const bool __assignable = is_copy_assignable<_ValueType>::value;
+#endif
- std::__uninitialized_fill<__is_trivial(_ValueType)>::
+ std::__uninitialized_fill<__is_trivial(_ValueType) && __assignable>::
__uninit_fill(__first, __last, __x);
}
{
typedef typename iterator_traits<_ForwardIterator>::value_type
_ValueType;
+#if __cplusplus < 201103L
+ const bool __assignable = true;
+#else
+ // trivial types can have deleted assignment
+ const bool __assignable = is_copy_assignable<_ValueType>::value;
+#endif
- std::__uninitialized_fill_n<__is_trivial(_ValueType)>::
+ std::__uninitialized_fill_n<__is_trivial(_ValueType) && __assignable>::
__uninit_fill_n(__first, __n, __x);
}
{
typedef typename iterator_traits<_ForwardIterator>::value_type
_ValueType;
+ // trivial types can have deleted assignment
+ const bool __assignable = is_copy_assignable<_ValueType>::value;
- std::__uninitialized_default_1<__is_trivial(_ValueType)>::
+ std::__uninitialized_default_1<__is_trivial(_ValueType)
+ && __assignable>::
__uninit_default(__first, __last);
}
{
typedef typename iterator_traits<_ForwardIterator>::value_type
_ValueType;
+ // trivial types can have deleted assignment
+ const bool __assignable = is_copy_assignable<_ValueType>::value;
- std::__uninitialized_default_n_1<__is_trivial(_ValueType)>::
+ std::__uninitialized_default_n_1<__is_trivial(_ValueType)
+ && __assignable>::
__uninit_default_n(__first, __n);
}
--- /dev/null
+// Copyright (C) 2013 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/>.
+
+// 20.7.12 specialized algorithms
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <memory>
+
+// libstdc++/58982
+
+// trivial class that is not assignable
+struct T
+{
+ T() = default;
+ ~T() = default;
+
+ T& operator=(const T&) = delete;
+};
+
+void
+test01(T* result)
+{
+ T t[1];
+ std::uninitialized_copy(t, t+1, result);
+}
--- /dev/null
+// Copyright (C) 2013 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/>.
+
+// 20.7.12 specialized algorithms
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <memory>
+
+// libstdc++/58982
+
+// trivial class that is not assignable
+struct T
+{
+ T() = default;
+ ~T() = default;
+
+ T& operator=(const T&) = delete;
+};
+
+void
+test01(T* result)
+{
+ T t[1];
+ std::uninitialized_copy_n(t, 1, result);
+}
--- /dev/null
+// Copyright (C) 2013 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/>.
+
+// 20.7.12 specialized algorithms
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <memory>
+
+// libstdc++/58982
+
+// trivial class that is not assignable
+struct T
+{
+ T() = default;
+ ~T() = default;
+
+ T& operator=(const T&) = delete;
+};
+
+void
+test01(T* first, T* last)
+{
+ T t;
+ std::uninitialized_fill(first, last, t);
+}
--- /dev/null
+// Copyright (C) 2013 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/>.
+
+// 20.7.12 specialized algorithms
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <memory>
+
+// libstdc++/58982
+
+// trivial class that is not assignable
+struct T
+{
+ T() = default;
+ ~T() = default;
+
+ T& operator=(const T&) = delete;
+};
+
+void
+test01(T* first)
+{
+ T t;
+ std::uninitialized_fill_n(first, 1, t);
+}
--- /dev/null
+// Copyright (C) 2013 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/>.
+
+// 25.3.1 copy
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <algorithm>
+
+// libstdc++/58982
+
+// trivial class that is not assignable
+struct T
+{
+ T() = default;
+ ~T() = default;
+
+ T& operator=(const T&) = delete;
+};
+
+void
+test01(T* result)
+{
+ T t[1];
+ std::copy(t, t+1, result); // { dg-error "here" }
+}
+// { dg-prune-output "not assignable" }
--- /dev/null
+// Copyright (C) 2013 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/>.
+
+// 25.3.1 copy
+
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+#include <algorithm>
+
+// libstdc++/58982
+
+// trivial class that is not assignable
+struct T
+{
+ T() = default;
+ ~T() = default;
+
+ T& operator=(const T&) = delete;
+};
+
+void
+test01(T* result)
+{
+ T t[1];
+ std::copy_n(t, 1, result); // { dg-error "here" }
+}
+// { dg-prune-output "not assignable" }
projects / gcc.git / commitdiff