From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E07C239ADC32; Fri, 11 Jun 2021 22:26:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E07C239ADC32 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-8560] libstdc++: Fix constraint on std::optional assignment [PR 100982] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 4f11586945fffd0ff808c16f2f341f9e85d83749 X-Git-Newrev: e198d93d49f89a3b69f9b4e4c305f9f8b511027a Message-Id: <20210611222602.E07C239ADC32@sourceware.org> Date: Fri, 11 Jun 2021 22:26:02 +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: Fri, 11 Jun 2021 22:26:03 -0000 https://gcc.gnu.org/g:e198d93d49f89a3b69f9b4e4c305f9f8b511027a commit r11-8560-ge198d93d49f89a3b69f9b4e4c305f9f8b511027a Author: Jonathan Wakely Date: Wed Jun 9 11:03:15 2021 +0100 libstdc++: Fix constraint on std::optional assignment [PR 100982] libstdc++-v3/ChangeLog: PR libstdc++/100982 * include/std/optional (optional::operator=(const optional&)): Fix value category used in is_assignable check. * testsuite/20_util/optional/assignment/100982.cc: New test. (cherry picked from commit b3fce1bd45f72cc9e55fb7431762e92e30fefcf1) Diff: --- libstdc++-v3/include/std/optional | 2 +- .../testsuite/20_util/optional/assignment/100982.cc | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/optional b/libstdc++-v3/include/std/optional index 415f8c49ef4..0a67ce24bbd 100644 --- a/libstdc++-v3/include/std/optional +++ b/libstdc++-v3/include/std/optional @@ -815,7 +815,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template enable_if_t<__and_v<__not_>, is_constructible<_Tp, const _Up&>, - is_assignable<_Tp&, _Up>, + is_assignable<_Tp&, const _Up&>, __not_<__converts_from_optional<_Tp, _Up>>, __not_<__assigns_from_optional<_Tp, _Up>>>, optional&> diff --git a/libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc b/libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc new file mode 100644 index 00000000000..ae565250d68 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/optional/assignment/100982.cc @@ -0,0 +1,17 @@ +// { dg-do compile { target c++17 } } + +#include + +struct U {}; + +struct T { + explicit T(const U&); + T& operator=(const U&); + T& operator=(U&&) = delete; +}; + +int main() { + std::optional opt1; + std::optional opt2; + opt2 = opt1; // PR libstdc++/100982 +}