diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cp-gimplify.c | 29 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/pr94272.C | 14 |
4 files changed, 53 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 34ccb9f..9ff2525 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2020-03-26 Jakub Jelinek <jakub@redhat.com> + + PR c++/94272 + * cp-gimplify.c (cp_genericize_r): Handle STATEMENT_LIST. + 2020-03-25 Patrick Palka <ppalka@redhat.com> PR c++/94265 diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c index aa80384..d003f5b 100644 --- a/gcc/cp/cp-gimplify.c +++ b/gcc/cp/cp-gimplify.c @@ -1754,6 +1754,35 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) walk_subtrees = 0; break; + case STATEMENT_LIST: + if (TREE_SIDE_EFFECTS (stmt)) + { + tree_stmt_iterator i; + int nondebug_stmts = 0; + bool clear_side_effects = true; + /* Genericization can clear TREE_SIDE_EFFECTS, e.g. when + transforming an IF_STMT into COND_EXPR. If such stmt + appears in a STATEMENT_LIST that contains only that + stmt and some DEBUG_BEGIN_STMTs, without -g where the + STATEMENT_LIST wouldn't be present at all the resulting + expression wouldn't have TREE_SIDE_EFFECTS set, so make sure + to clear it even on the STATEMENT_LIST in such cases. */ + for (i = tsi_start (stmt); !tsi_end_p (i); tsi_next (&i)) + { + tree t = tsi_stmt (i); + if (TREE_CODE (t) != DEBUG_BEGIN_STMT && nondebug_stmts < 2) + nondebug_stmts++; + cp_walk_tree (tsi_stmt_ptr (i), cp_genericize_r, data, NULL); + if (TREE_CODE (t) != DEBUG_BEGIN_STMT + && (nondebug_stmts > 1 || TREE_SIDE_EFFECTS (tsi_stmt (i)))) + clear_side_effects = false; + } + if (clear_side_effects) + TREE_SIDE_EFFECTS (stmt) = 0; + *walk_subtrees = 0; + } + break; + default: if (IS_TYPE_OR_DECL_P (stmt)) *walk_subtrees = 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f8512d3..6d5c12f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-03-26 Jakub Jelinek <jakub@redhat.com> + + PR c++/94272 + * g++.dg/debug/pr94272.C: New test. + 2020-03-26 Felix Yang <felix.yang@huawei.com> PR tree-optimization/94269 diff --git a/gcc/testsuite/g++.dg/debug/pr94272.C b/gcc/testsuite/g++.dg/debug/pr94272.C new file mode 100644 index 0000000..78522e0 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/pr94272.C @@ -0,0 +1,14 @@ +// PR c++/94272 +// { dg-do compile } +// { dg-options "-O2 -fnon-call-exceptions -fcompare-debug" } + +int *c, d, *e; + +void +foo () +{ + if (c && d) + ; + else if (*e) + ; +} |