[Bug c++/61611] Incorrect exception rethrown from a function-try-catch block when a nested try-catch executes

[cvs-commit at gcc dot gnu.org via Gcc-bugs]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61611

--- Comment #2 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jason Merrill <ja...@gcc.gnu.org>:

https://gcc.gnu.org/g:6ad76e73375a9c00a0a5f5729ae70bce7a6db5bc

commit r12-6334-g6ad76e73375a9c00a0a5f5729ae70bce7a6db5bc
Author: Jason Merrill <ja...@redhat.com>
Date:   Thu Jan 6 09:45:26 2022 -0500

    c++: nested catch in ctor fn-try-block [PR61611]

    Being in_function_try_handler isn't enough to satisfy the condition of
    reaching the end of such a handler; in this case, we're reaching the end of
    a handler within that handler, so we don't want the special semantics.

            PR c++/61611

    gcc/cp/ChangeLog:

            * except.c (in_nested_catch): New.
            (expand_end_catch_block): Check it.

    gcc/testsuite/ChangeLog:

            * g++.dg/eh/ctor-fntry1.C: New test.