diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2024-02-28 14:45:18 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2024-02-28 14:50:13 +0000 |
| commit | 80c386cb20d38ebc55f30a79418fabfbed904b87 (patch) | |
| tree | 522342a5d00b1e69eb178034eccad744dc97e756 | |
| parent | 06866bc368f828fa4f3dad25588d038414944c2e (diff) | |
| download | gcc-80c386cb20d38ebc55f30a79418fabfbed904b87.zip gcc-80c386cb20d38ebc55f30a79418fabfbed904b87.tar.gz gcc-80c386cb20d38ebc55f30a79418fabfbed904b87.tar.bz2 | |
libstdc++: Fix noexcept on dtors in <experimental/scope> [PR114152]
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.
| -rw-r--r-- | libstdc++-v3/include/experimental/scope | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/experimental/scopeguard/114152.cc | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/libstdc++-v3/include/experimental/scope b/libstdc++-v3/include/experimental/scope index 5dbeac1..ea273e8 100644 --- a/libstdc++-v3/include/experimental/scope +++ b/libstdc++-v3/include/experimental/scope @@ -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(); diff --git a/libstdc++-v3/testsuite/experimental/scopeguard/114152.cc b/libstdc++-v3/testsuite/experimental/scopeguard/114152.cc new file mode 100644 index 0000000..63c1f710 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/scopeguard/114152.cc @@ -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()) ); |