From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id D7E3E3858427; Sun, 2 Jan 2022 17:56:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7E3E3858427 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6169] c++: don't wrap cleanups that can't throw X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: 4620531ea988d6d2ede7c8f168074586ba64f482 X-Git-Newrev: 092e60f57adeccf98e876af6b7b5734337904812 Message-Id: <20220102175609.D7E3E3858427@sourceware.org> Date: Sun, 2 Jan 2022 17:56:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jan 2022 17:56:09 -0000 https://gcc.gnu.org/g:092e60f57adeccf98e876af6b7b5734337904812 commit r12-6169-g092e60f57adeccf98e876af6b7b5734337904812 Author: Jason Merrill Date: Thu Dec 30 00:10:57 2021 -0500 c++: don't wrap cleanups that can't throw Since C++11, the vast majority of destructors are noexcept, so wrap_temporary_cleanups adds a bunch of useless TRY_CATCH_EXPR to be removed later in the optimizers. It's simple to avoid adding them in the first place. gcc/cp/ChangeLog: * decl.c (wrap_cleanups_r): Don't wrap if noexcept. gcc/testsuite/ChangeLog: * g++.dg/eh/cleanup6.C: New test. Diff: --- gcc/cp/decl.c | 14 ++++++++------ gcc/testsuite/g++.dg/eh/cleanup6.C | 13 +++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 982fca8983d..51c69957635 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -7428,12 +7428,14 @@ wrap_cleanups_r (tree *stmt_p, int *walk_subtrees, void *data) tree guard = (tree)data; tree tcleanup = TARGET_EXPR_CLEANUP (*stmt_p); - tcleanup = build2 (TRY_CATCH_EXPR, void_type_node, tcleanup, guard); - /* Tell honor_protect_cleanup_actions to handle this as a separate - cleanup. */ - TRY_CATCH_IS_CLEANUP (tcleanup) = 1; - - TARGET_EXPR_CLEANUP (*stmt_p) = tcleanup; + if (tcleanup && !expr_noexcept_p (tcleanup, tf_none)) + { + tcleanup = build2 (TRY_CATCH_EXPR, void_type_node, tcleanup, guard); + /* Tell honor_protect_cleanup_actions to handle this as a separate + cleanup. */ + TRY_CATCH_IS_CLEANUP (tcleanup) = 1; + TARGET_EXPR_CLEANUP (*stmt_p) = tcleanup; + } } return NULL_TREE; diff --git a/gcc/testsuite/g++.dg/eh/cleanup6.C b/gcc/testsuite/g++.dg/eh/cleanup6.C new file mode 100644 index 00000000000..e27563f4569 --- /dev/null +++ b/gcc/testsuite/g++.dg/eh/cleanup6.C @@ -0,0 +1,13 @@ +// Test that we don't wrap the non-throwing A cleanup with a B cleanup. + +// { dg-do compile { target c++11 } } +// { dg-additional-options -fdump-tree-gimple } +// { dg-final { scan-tree-dump-times "B::~B" 1 "gimple" } } + +struct A { A(); ~A(); }; +struct B { B(const A& = A()); ~B(); }; + +int main() +{ + B b; +}