]> gcc.gnu.org Git - gcc.git/commit
c++: retval dtor on rethrow [PR112301]
authorJason Merrill <jason@redhat.com>
Mon, 30 Oct 2023 21:44:54 +0000 (17:44 -0400)
committerJason Merrill <jason@redhat.com>
Fri, 17 Nov 2023 00:21:04 +0000 (19:21 -0500)
commitd237e7b291ff52095d600e6489a54b4ba8aaf608
tree1fc7f01a99064fd6fbbec46fee01dc162544eb21
parentaabc13dc7dfdede61cc51f96d9e9b942aba66baf
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.
gcc/cp/except.cc
gcc/cp/semantics.cc
gcc/testsuite/g++.dg/eh/return1.C
This page took 0.063291 seconds and 6 git commands to generate.