diff options
author | Jason Merrill <jason@redhat.com> | 2023-10-30 17:44:54 -0400 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2023-11-02 16:01:38 -0400 |
commit | ae07265381d934ee97fb1ce8915731158c91babc (patch) | |
tree | 0ea0046259c3306f7c1fdb50be7e043f7df363e6 /gcc/fortran/parse.cc | |
parent | 6afa984f47e16e8bd958646d7407b74e61041f5d (diff) | |
download | gcc-ae07265381d934ee97fb1ce8915731158c91babc.zip gcc-ae07265381d934ee97fb1ce8915731158c91babc.tar.gz gcc-ae07265381d934ee97fb1ce8915731158c91babc.tar.bz2 |
c++: retval dtor on rethrow [PR112301]
In r12-6333 for PR33799, I fixed the example in [except.ctor]/2. In that
testcase, the exception is caught and the function returns again,
successfully.
In this testcase, however, the exception is rethrown, and hits two separate
cleanups: one in the try block and the other in the function body. So we
destroy twice an object that was only constructed once.
Fortunately, the fix for the normal case is easy: we just need to clear the
"return value constructed by return" flag when we do it the first time.
This gets more complicated with the named return value optimization, since
we don't want to destroy the return value while the NRV variable is still in
scope.
PR c++/112301
PR c++/102191
PR c++/33799
gcc/cp/ChangeLog:
* except.cc (maybe_splice_retval_cleanup): Clear
current_retval_sentinel when destroying retval.
* semantics.cc (nrv_data): Add in_nrv_cleanup.
(finalize_nrv): Set it.
(finalize_nrv_r): Fix handling of throwing cleanups.
gcc/testsuite/ChangeLog:
* g++.dg/eh/return1.C: Add more cases.
Diffstat (limited to 'gcc/fortran/parse.cc')
0 files changed, 0 insertions, 0 deletions