From 1da8ab97a129ded60471ffcc2595ddce67336cd8 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 30 Jul 2019 13:00:35 +0200 Subject: [PATCH] Mark 2nd argument of delete operator as needed (PR tree-optimization/91270). 2019-07-30 Martin Liska PR tree-optimization/91270 * tree-ssa-dce.c (propagate_necessity): Mark 2nd argument of delete operator as needed. 2019-07-30 Martin Liska PR tree-optimization/91270 * g++.dg/torture/pr91270.C: New test. From-SVN: r273906 --- gcc/cp/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/torture/pr91270.C | 10 ++++++++++ gcc/tree-ssa-dce.c | 21 ++++++++++++++++----- 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/torture/pr91270.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index eeed3dcef55..425eea11a7c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2019-07-30 Martin Liska + + PR tree-optimization/91270 + * tree-ssa-dce.c (propagate_necessity): Mark 2nd argument + of delete operator as needed. + 2019-07-25 Martin Liska Dominik Infuhr diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a856986db4..bad56871823 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-07-30 Martin Liska + + PR tree-optimization/91270 + * g++.dg/torture/pr91270.C: New test. + 2019-07-30 Richard Sandiford * gcc.dg/vect/vect-cond-arith-7.c: New test. diff --git a/gcc/testsuite/g++.dg/torture/pr91270.C b/gcc/testsuite/g++.dg/torture/pr91270.C new file mode 100644 index 00000000000..60d766e9e9f --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr91270.C @@ -0,0 +1,10 @@ +/* { dg-do compile } */ + +struct S { + ~S(); +}; +int a = 123; +void fn1() { + S *s = new S[a]; + delete[] s; +} diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c index 763b76f0e53..bec13cd5930 100644 --- a/gcc/tree-ssa-dce.c +++ b/gcc/tree-ssa-dce.c @@ -804,10 +804,11 @@ propagate_necessity (bool aggressive) /* If this is a call to free which is directly fed by an allocation function do not mark that necessary through processing the argument. */ - if (gimple_call_builtin_p (stmt, BUILT_IN_FREE) - || (is_gimple_call (stmt) - && gimple_call_operator_delete_p (as_a (stmt)))) - + bool is_delete_operator + = (is_gimple_call (stmt) + && gimple_call_operator_delete_p (as_a (stmt))); + if (is_delete_operator + || gimple_call_builtin_p (stmt, BUILT_IN_FREE)) { tree ptr = gimple_call_arg (stmt, 0); gimple *def_stmt; @@ -822,7 +823,17 @@ propagate_necessity (bool aggressive) || DECL_FUNCTION_CODE (def_callee) == BUILT_IN_MALLOC || DECL_FUNCTION_CODE (def_callee) == BUILT_IN_CALLOC)) || DECL_IS_REPLACEABLE_OPERATOR_NEW_P (def_callee))) - continue; + { + /* Some delete operators have size as 2nd argument. */ + if (is_delete_operator && gimple_call_num_args (stmt) >= 2) + { + tree size_argument = gimple_call_arg (stmt, 1); + if (TREE_CODE (size_argument) == SSA_NAME) + mark_operand_necessary (size_argument); + } + + continue; + } } FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, SSA_OP_USE) -- 2.30.2