From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8270E38582BE; Tue, 21 Feb 2023 00:48:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8270E38582BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676940507; bh=pE7WqQPp0BcRGVtew16cYZAlpO+OAnhFbz3HUqAfxvo=; h=From:To:Subject:Date:From; b=Ys0IbNQwDiQNnSgc9acoe7+w2wbJCXu0g/ynvpF92IHoOONVO8Hh+HYMUFsTdt9IP GAVdCLmF0Bx65DugkxkQo4ibHus+370tBudDRw2PThrLsUwFeOmdTOoIfQj5qOPIVh lsluVkLTgCzSIIGnVHcwNegBjkMq2jfQYykmcnvQ= 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-9194] libstdc++: Add noexcept-specifier to std::reference_wrapper::operator() X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 0a2597477e482df4d67db6696431286df1ff4428 X-Git-Newrev: 5e8ff1c84b1599c747cd161d5370235791242bf3 Message-Id: <20230221004827.8270E38582BE@sourceware.org> Date: Tue, 21 Feb 2023 00:48:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:5e8ff1c84b1599c747cd161d5370235791242bf3 commit r12-9194-g5e8ff1c84b1599c747cd161d5370235791242bf3 Author: Jonathan Wakely Date: Wed Aug 31 13:57:34 2022 +0100 libstdc++: Add noexcept-specifier to std::reference_wrapper::operator() This isn't required by the standard, but there's an LWG issue suggesting to add it. Also use __invoke_result instead of result_of, to match the spec in recent standards. libstdc++-v3/ChangeLog: * include/bits/refwrap.h (reference_wrapper::operator()): Add noexcept-specifier and use __invoke_result instead of result_of. * testsuite/20_util/reference_wrapper/invoke-noexcept.cc: New test. (cherry picked from commit e47df5eb56c4e7aca0d3e50826e5aaa1887fa446) Diff: --- libstdc++-v3/include/bits/refwrap.h | 3 ++- .../20_util/reference_wrapper/invoke-noexcept.cc | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/refwrap.h b/libstdc++-v3/include/bits/refwrap.h index 8016f87478e..976902bc7bc 100644 --- a/libstdc++-v3/include/bits/refwrap.h +++ b/libstdc++-v3/include/bits/refwrap.h @@ -348,8 +348,9 @@ _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type) template _GLIBCXX20_CONSTEXPR - typename result_of<_Tp&(_Args&&...)>::type + typename __invoke_result<_Tp&, _Args...>::type operator()(_Args&&... __args) const + noexcept(__is_nothrow_invocable<_Tp&, _Args...>::value) { #if __cplusplus > 201703L if constexpr (is_object_v) diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-noexcept.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-noexcept.cc new file mode 100644 index 00000000000..91b5d097f08 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-noexcept.cc @@ -0,0 +1,15 @@ +// { dg-do compile { target c++11 } } + +// C++11 20.8.3.4 reference_wrapper invocation [refwrap.invoke] + +#include + +struct F +{ + int operator()() noexcept(true) { return 1; } + int operator()() const noexcept(false) { return 2; } +}; + +F f; +static_assert( noexcept(std::ref(f)()) ); +static_assert( ! noexcept(std::cref(f)()) );