From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1946) id CA2733858D34; Thu, 2 Jul 2020 19:44:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA2733858D34 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1593719051; bh=CxyErIJoMCePVdAYUHtS697vXB7nOkOTMZwWynHfVJU=; h=From:To:Subject:Date:From; b=Gx55dgacW8yueULhqDeyezKnM0GH3aNEE3tbigabeCJJ2Z7f3InSWAQ1/mlGat79k RJJ9bTTUdyezfCG8ol248UmTz9E9BLGCUxHVUXABWxu3IV3AZNQ89dTympECPw+NjE jy5ENUPTfTwMGrlLJiMA5H3eW/fpEzH30hdsWuhE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Ville Voutilainen To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r9-8716] PR libstdc++/91807 X-Act-Checkin: gcc X-Git-Author: Ville Voutilainen X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 3a3e472c9f6b79c2edd6595c345b77c0779ec2c6 X-Git-Newrev: eb77f6f1b74aa200b70eb0a9e261c9f3b68294a0 Message-Id: <20200702194411.CA2733858D34@sourceware.org> Date: Thu, 2 Jul 2020 19:44:11 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2020 19:44:11 -0000 https://gcc.gnu.org/g:eb77f6f1b74aa200b70eb0a9e261c9f3b68294a0 commit r9-8716-geb77f6f1b74aa200b70eb0a9e261c9f3b68294a0 Author: Ville Voutilainen Date: Thu Jul 2 22:16:39 2020 +0300 PR libstdc++/91807 PR libstdc++/91807 * include/std/variant (_Copy_assign_base::operator=(const _Copy_assign_base&): Do the move-assignment from a temporary so that the temporary is constructed with an explicit index. * testsuite/20_util/variant/91807.cc: New. (cherry picked from commit dbca7a69f276e4829354f87f2747ebff36f6090e) Diff: --- libstdc++-v3/include/std/variant | 3 ++- libstdc++-v3/testsuite/20_util/variant/91807.cc | 35 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 75fb0dc164a..e1882b36700 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -606,7 +606,8 @@ namespace __variant this->_M_destructive_copy(__rhs_index, __rhs_mem); else __variant_cast<_Types...>(*this) - = variant<_Types...>(__rhs_mem); + = variant<_Types...>(std::in_place_index<__rhs_index>, + __rhs_mem); } } else diff --git a/libstdc++-v3/testsuite/20_util/variant/91807.cc b/libstdc++-v3/testsuite/20_util/variant/91807.cc new file mode 100644 index 00000000000..04bb5d7c807 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/variant/91807.cc @@ -0,0 +1,35 @@ +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++17 } } + +// Copyright (C) 2020 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 +// . + +#include + +struct me_data { + me_data() = default; + + me_data(const me_data &) {}; + me_data(me_data &&) noexcept {}; + me_data& operator=(const me_data &) = default; +}; + +int main() { + std::variant v1, v2; + + v2 = v1; +}