mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-22 03:39:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix assertions for move assignment of trivial types

Browse Source 
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: r232842
This commit is contained in:
Jonathan Wakely 2016-01-26 19:38:20 +00:00 committed by Jonathan Wakely
parent 2a4dfe66da
commit f1d591e8a6
6 changed files with 180 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,15 @@
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.
2016-01-26 Andris Pavenis <andris.pavenis@iki.fi>
* include/c_compatibility/stdlib.h: Include wide character related

12
libstdc++-v3/include/bits/stl_algobase.h
View File

@ -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)

40
libstdc++-v3/testsuite/25_algorithms/copy/move_iterators/69478.cc Normal file
View File

@ -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);
}

40
libstdc++-v3/testsuite/25_algorithms/copy_backward/move_iterators/69478.cc Normal file
View File

@ -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);
}

40
libstdc++-v3/testsuite/25_algorithms/move/69478.cc Normal file
View File

@ -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);
}

40
libstdc++-v3/testsuite/25_algorithms/move_backward/69478.cc Normal file
View File

@ -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);
}