diff options
author | Jason Merrill <jason@redhat.com> | 2022-01-06 09:45:26 -0500 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2022-01-06 19:25:43 -0500 |
commit | 6ad76e73375a9c00a0a5f5729ae70bce7a6db5bc (patch) | |
tree | 8bef3fdb4867b142b1006f4dc37069f47bcfc8cf /gcc | |
parent | b10e031458d541f794dfaa08ba606487603a4bb6 (diff) | |
download | gcc-6ad76e73375a9c00a0a5f5729ae70bce7a6db5bc.zip gcc-6ad76e73375a9c00a0a5f5729ae70bce7a6db5bc.tar.gz gcc-6ad76e73375a9c00a0a5f5729ae70bce7a6db5bc.tar.bz2 |
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.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/except.c | 20 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/eh/ctor-fntry1.C | 23 |
2 files changed, 42 insertions, 1 deletions
diff --git a/gcc/cp/except.c b/gcc/cp/except.c index bcd9f84..9b746be 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -448,6 +448,23 @@ expand_start_catch_block (tree decl) return type; } +/* True if we are in a catch block within a catch block. Assumes that we are + in function scope. */ + +static bool +in_nested_catch (void) +{ + int catches = 0; + + /* Scan through the template parameter scopes. */ + for (cp_binding_level *b = current_binding_level; + b->kind != sk_function_parms; + b = b->level_chain) + if (b->kind == sk_catch + && ++catches == 2) + return true; + return false; +} /* Call this to end a catch block. Its responsible for emitting the code to handle jumping back to the correct place, and for emitting @@ -463,7 +480,8 @@ expand_end_catch_block (void) a handler of the function-try-block of a constructor or destructor. */ if (in_function_try_handler && (DECL_CONSTRUCTOR_P (current_function_decl) - || DECL_DESTRUCTOR_P (current_function_decl))) + || DECL_DESTRUCTOR_P (current_function_decl)) + && !in_nested_catch ()) { tree rethrow = build_throw (input_location, NULL_TREE); /* Disable all warnings for the generated rethrow statement. */ diff --git a/gcc/testsuite/g++.dg/eh/ctor-fntry1.C b/gcc/testsuite/g++.dg/eh/ctor-fntry1.C new file mode 100644 index 0000000..0c783bb --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/ctor-fntry1.C @@ -0,0 +1,23 @@ +// PR c++/61611 +// { dg-do run } + +struct A { }; +struct B { }; + +struct Test +{ + Test() + try { throw A(); } + catch(const A&) + { + try { throw B(); } + catch(const B&) { } + } +}; + +int +main() +{ + try { Test x; } + catch(const A&) { } +} |