diff options
| author | Martin Liska <mliska@suse.cz> | 2022-10-15 15:32:39 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-10-15 15:32:39 +0200 |
| commit | 2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9 (patch) | |
| tree | b118381a0a883a762ddd56c0e91608d937ee8bdf /gcc/cp/except.cc | |
| parent | bd21c04269deded2c7476ceca1100a26f28ea526 (diff) | |
| parent | baeec7cc83b19b46d1c73523f06efa7ea2b30390 (diff) | |
| download | gcc-2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9.zip gcc-2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9.tar.gz gcc-2c92cfe87d2bb8aa0eb78f3932fca16699cb35c9.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/cp/except.cc')
| -rw-r--r-- | gcc/cp/except.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index 703d1d5..2677a9b 100644 --- a/gcc/cp/except.cc +++ b/gcc/cp/except.cc @@ -1307,9 +1307,12 @@ maybe_splice_retval_cleanup (tree compound_stmt) { /* If we need a cleanup for the return value, add it in at the same level as pushdecl_outermost_localscope. And also in try blocks. */ - bool function_body + const bool function_body = (current_binding_level->level_chain - && current_binding_level->level_chain->kind == sk_function_parms); + && current_binding_level->level_chain->kind == sk_function_parms + /* When we're processing a default argument, c_f_d may not have been + set. */ + && current_function_decl); if ((function_body || current_binding_level->kind == sk_try) && !DECL_CONSTRUCTOR_P (current_function_decl) |