procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Fix noexcept on dtors in <experimental/scope> [PR114152]

Browse source 
The PR points out that the destructors all have incorrect
noexcept-specifiers.

libstdc++-v3/ChangeLog:

	PR libstdc++/114152
	* include/experimental/scope (scope_exit scope_fail): Make
	destructor unconditionally noexcept.
	(scope_sucess): Fix noexcept-specifier.
	* testsuite/experimental/scopeguard/114152.cc: New test.
This commit is contained in:
Jonathan Wakely 2024-02-28 14:45:18 +00:00
parent 06866bc368
commit 80c386cb20
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/include/experimental/scope
View file

@ -97,7 +97,7 @@ namespace experimental::inline fundamentals_v3
scope_exit& operator=(const scope_exit&) = delete;
scope_exit& operator=(scope_exit&&) = delete;
~scope_exit() noexcept(noexcept(this->_M_exit_function))
~scope_exit() noexcept
{
if (_M_execute_on_destruction)
_M_exit_function();
@ -157,7 +157,7 @@ namespace experimental::inline fundamentals_v3
scope_fail& operator=(const scope_fail&) = delete;
scope_fail& operator=(scope_fail&&) = delete;
~scope_fail() noexcept(noexcept(this->_M_exit_function))
~scope_fail() noexcept
{
if (std::uncaught_exceptions() > _M_uncaught_init)
_M_exit_function();
@ -211,7 +211,7 @@ namespace experimental::inline fundamentals_v3
scope_success& operator=(const scope_success&) = delete;
scope_success& operator=(scope_success&&) = delete;
~scope_success() noexcept(noexcept(this->_M_exit_function))
~scope_success() noexcept(noexcept(this->_M_exit_function()))
{
if (std::uncaught_exceptions() <= _M_uncaught_init)
_M_exit_function();

24
libstdc++-v3/testsuite/experimental/scopeguard/114152.cc Normal file
View file

@ -0,0 +1,24 @@
// { dg-do compile { target c++20 } }
// PR libstdc++/114152
// Wrong exception specifiers for LFTSv3 scope guard destructors
#include <experimental/scope>
using namespace std::experimental;
struct F {
void operator()() noexcept(false);
};
static_assert( noexcept(std::declval<scope_exit<F>&>().~scope_exit()) );
static_assert( noexcept(std::declval<scope_fail<F>&>().~scope_fail()) );
static_assert( ! noexcept(std::declval<scope_success<F>&>().~scope_success()) );
struct G {
void operator()() noexcept(true);
};
static_assert( noexcept(std::declval<scope_exit<G>&>().~scope_exit()) );
static_assert( noexcept(std::declval<scope_fail<G>&>().~scope_fail()) );
static_assert( noexcept(std::declval<scope_success<G>&>().~scope_success()) );