OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c++: new (nothrow) array cleanup [PR104007]

Browse Source 
For this testcase, the cleanup that is supposed to happen if initialization
throws was wrongly being run on the normal control path as well.  This turns
out to be because the EH-only handling in gimple_push_cleanup didn't apply
to conditional cleanups such as we have for nothrow new, since we check
whether the result is non-null before proceeding with the initialization.

	PR c++/104007

gcc/ChangeLog:

	* gimplify.cc (gimple_push_cleanup): Handle eh_only in conditional
	context.

gcc/testsuite/ChangeLog:

	* g++.dg/eh/new2.C: New test.
This commit is contained in:
Jason Merrill 2022-01-17 17:08:03 -05:00
parent 3a0837b8fb
commit 7ca2160170
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/gimplify.cc
View File

@ -6885,6 +6885,7 @@ gimple_push_cleanup (tree var, tree cleanup, bool eh_only, gimple_seq *pre_p,
cleanup = build3 (COND_EXPR, void_type_node, flag, cleanup, NULL);
gimplify_stmt (&cleanup, &cleanup_stmts);
wce = gimple_build_wce (cleanup_stmts);
gimple_wce_set_cleanup_eh_only (wce, eh_only);
gimplify_seq_add_stmt (&gimplify_ctxp->conditional_cleanups, ffalse);
gimplify_seq_add_stmt (&gimplify_ctxp->conditional_cleanups, wce);

10
gcc/testsuite/g++.dg/eh/new2.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/104007
// { dg-do run }
extern "C" void abort();
#include <new>
struct S { ~S() { abort(); } };
int main() {
new (std::nothrow) S[1];
}