From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4C4A3385380B; Tue, 16 May 2023 12:50:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C4A3385380B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684241426; bh=FDiT6CuhPTJrcIsMXsRZdXJuSoAYGST77wZd/Y8c4A0=; h=From:To:Subject:Date:From; b=jxEjy+GDdUXKblyhY6bV0L6XNgwHFpGt54AMrnrkIY9UmmuqQYBkjNoGR+EYZ7/c0 qLrorkVZGIG5UR2bLxDX4XiF6DjcjDOYF9EQHZPMVxWKq81ImlM9ncZUqfMSyumRpY JUbZpgTlDNxdRmefd2uZVRQXdWt2o5rnC4HLvHyk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10772] libstdc++: Use emplace in std::variant::operator=(T&&) as per LWG 3585 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 33e8fbf0fd8af74ac76fce4a30b98bea5ad47439 X-Git-Newrev: 9e963f8c3f07ec9984275f94822e54e0be717b2a Message-Id: <20230516125026.4C4A3385380B@sourceware.org> Date: Tue, 16 May 2023 12:50:26 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9e963f8c3f07ec9984275f94822e54e0be717b2a commit r11-10772-g9e963f8c3f07ec9984275f94822e54e0be717b2a Author: Jonathan Wakely Date: Wed Feb 1 20:54:22 2023 +0000 libstdc++: Use emplace in std::variant::operator=(T&&) as per LWG 3585 This was approved at the October 2021 plenary. libstdc++-v3/ChangeLog: * include/std/variant (variant::operator=): Implement resolution of LWG 3585. * testsuite/20_util/variant/lwg3585.cc: New test. (cherry picked from commit 1395415fdc2d60e5346dbcf476749daf42d5b724) Diff: --- libstdc++-v3/include/std/variant | 4 +++- libstdc++-v3/testsuite/20_util/variant/lwg3585.cc | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 285c5be6521..922d2100c2f 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1472,7 +1472,9 @@ namespace __variant || !is_nothrow_move_constructible_v<_Tj>) this->emplace<__index>(std::forward<_Tp>(__rhs)); else - operator=(variant(std::forward<_Tp>(__rhs))); + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3585. converting assignment with immovable alternative + this->emplace<__index>(_Tj(std::forward<_Tp>(__rhs))); } return *this; } diff --git a/libstdc++-v3/testsuite/20_util/variant/lwg3585.cc b/libstdc++-v3/testsuite/20_util/variant/lwg3585.cc new file mode 100644 index 00000000000..0cbfc0db7f5 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/variant/lwg3585.cc @@ -0,0 +1,16 @@ +// { dg-do compile { target c++17 } } + +// LWG 3585. Variant converting assignment with immovable alternative + +#include +#include + +struct A { + A() = default; + A(A&&) = delete; +}; + +int main() { + std::variant v; + v = "hello"; +}