OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR libstdc++/85183 fix std::variant move-assignment

Browse Source 
PR libstdc++/85183
	* include/std/variant (_Move_assign_base::operator=): Fix incorrect
	value categories.
	* testsuite/20_util/variant/85183.cc: New.

From-SVN: r259059
This commit is contained in:
Jonathan Wakely 2018-04-04 00:03:07 +01:00 committed by Jonathan Wakely
parent b6a7a294ce
commit c73847e77b
3 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2018-04-03 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/85183
* include/std/variant (_Move_assign_base::operator=): Fix incorrect
value categories.
* testsuite/20_util/variant/85183.cc: New.
2018-03-26 Jonathan Wakely <jwakely@redhat.com>
* include/std/variant (__get): Qualify calls to avoid ADL.

7
libstdc++-v3/include/std/variant
View File

@ -605,13 +605,14 @@ namespace __variant
if (__rhs._M_valid())
{
static constexpr void (*_S_vtable[])(void*, void*) =
{ &__erased_assign<_Types&, const _Types&>... };
_S_vtable[__rhs._M_index](this->_M_storage(), __rhs._M_storage());
{ &__erased_assign<_Types&, _Types&&>... };
_S_vtable[__rhs._M_index]
(this->_M_storage(), __rhs._M_storage());
}
}
else
{
_Move_assign_base __tmp(__rhs);
_Move_assign_base __tmp(std::move(__rhs));
this->~_Move_assign_base();
__try
{

35
libstdc++-v3/testsuite/20_util/variant/85183.cc Normal file
View File

@ -0,0 +1,35 @@
// Copyright (C) 2018 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++17" }
// { dg-do compile { target c++17 } }
#include <variant>
struct moveonly {
moveonly() noexcept { }
moveonly(moveonly&&) noexcept { }
moveonly& operator=(moveonly&&) noexcept { return *this; }
~moveonly() { }
};
void
test01()
{
std::variant<moveonly> v1, v2;
v1 = std::move(v2); // PR libstdc++/85183
}