From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4892C3858D28; Fri, 8 Apr 2022 17:30:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4892C3858D28 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 r12-8061] libstdc++: Fix std::bad_expected_access constructor [PR105146] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 5522dec054cb940fe83661b96249aa12c54c1d77 X-Git-Newrev: 29e355d0d671c7474935220e8bef784f05143820 Message-Id: <20220408173055.4892C3858D28@sourceware.org> Date: Fri, 8 Apr 2022 17:30:55 +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, 08 Apr 2022 17:30:55 -0000 https://gcc.gnu.org/g:29e355d0d671c7474935220e8bef784f05143820 commit r12-8061-g29e355d0d671c7474935220e8bef784f05143820 Author: Jonathan Wakely Date: Fri Apr 8 18:04:04 2022 +0100 libstdc++: Fix std::bad_expected_access constructor [PR105146] libstdc++-v3/ChangeLog: PR libstdc++/105146 * include/std/expected (bad_expected_access): Move constructor parameter. * testsuite/20_util/expected/bad.cc: New test. Diff: --- libstdc++-v3/include/std/expected | 2 +- libstdc++-v3/testsuite/20_util/expected/bad.cc | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/expected b/libstdc++-v3/include/std/expected index 39d07cda4a9..7b01a17fb57 100644 --- a/libstdc++-v3/include/std/expected +++ b/libstdc++-v3/include/std/expected @@ -95,7 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION class bad_expected_access : public bad_expected_access { public: explicit - bad_expected_access(_Er __e) : _M_val(__e) { } + bad_expected_access(_Er __e) : _M_val(std::move(__e)) { } // XXX const char* what() const noexcept override; diff --git a/libstdc++-v3/testsuite/20_util/expected/bad.cc b/libstdc++-v3/testsuite/20_util/expected/bad.cc new file mode 100644 index 00000000000..17bc6d69e88 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/expected/bad.cc @@ -0,0 +1,15 @@ +// { dg-options "-std=gnu++23" } +// { dg-do compile } + +#include + +struct E { + E() = default; + E(E&&) = default; +}; + +void +test_pr105146() +{ + std::bad_expected_access(E{}); +}