public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Alexandre Oliva <aoliva@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testbase)] PR libstdc++/91807 Date: Wed, 22 Jul 2020 07:45:23 +0000 (GMT) [thread overview] Message-ID: <20200722074523.68594389043E@sourceware.org> (raw) https://gcc.gnu.org/g:dbca7a69f276e4829354f87f2747ebff36f6090e commit dbca7a69f276e4829354f87f2747ebff36f6090e Author: Ville Voutilainen <ville.voutilainen@gmail.com> 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. 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 c9504914365..eb3d6779205 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -611,7 +611,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 +// <http://www.gnu.org/licenses/>. + +#include <variant> + +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<me_data, me_data> v1, v2; + + v2 = v1; +}
reply other threads:[~2020-07-22 7:45 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200722074523.68594389043E@sourceware.org \ --to=aoliva@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).