diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cfgrtl.c | 18 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/opt/pr94618.C | 25 |
4 files changed, 47 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 80b0534..8bce0ea 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2020-04-17 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/94618 + * cfgrtl.c (delete_insn_and_edges): Set purge not just when + insn is the BB_END of its block, but also when it is only followed + by DEBUG_INSNs in its block. + PR tree-optimization/94621 * tree-inline.c (remap_type_1): Don't dereference NULL TYPE_DOMAIN. Move id->adjust_array_error_bounds check first in the condition. diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c index fb551e3..e6ea687 100644 --- a/gcc/cfgrtl.c +++ b/gcc/cfgrtl.c @@ -230,10 +230,20 @@ delete_insn_and_edges (rtx_insn *insn) { bool purge = false; - if (INSN_P (insn) - && BLOCK_FOR_INSN (insn) - && BB_END (BLOCK_FOR_INSN (insn)) == insn) - purge = true; + if (INSN_P (insn) && BLOCK_FOR_INSN (insn)) + { + basic_block bb = BLOCK_FOR_INSN (insn); + if (BB_END (bb) == insn) + purge = true; + else if (DEBUG_INSN_P (BB_END (bb))) + for (rtx_insn *dinsn = NEXT_INSN (insn); + DEBUG_INSN_P (dinsn); dinsn = NEXT_INSN (dinsn)) + if (BB_END (bb) == dinsn) + { + purge = true; + break; + } + } delete_insn (insn); if (purge) return purge_dead_edges (BLOCK_FOR_INSN (insn)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 64181e4..dd2cb04 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2020-04-17 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/94618 + * g++.dg/opt/pr94618.C: New test. + PR tree-optimization/94621 * gcc.c-torture/compile/pr94621.c: New test. diff --git a/gcc/testsuite/g++.dg/opt/pr94618.C b/gcc/testsuite/g++.dg/opt/pr94618.C new file mode 100644 index 0000000..e6a81d2 --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr94618.C @@ -0,0 +1,25 @@ +// PR rtl-optimization/94618 +// { dg-do compile { target c++11 } } +// { dg-options "-O2 -fnon-call-exceptions -fcompare-debug" } + +struct S +{ + int a, b, c; + int foo () noexcept { return a; } + int bar () noexcept { return b; } + void baz (int); + void qux () { if (c) for (int x = foo (); x != bar (); ) baz (x); } +}; + +struct T +{ + S s; + void foo (); +}; + +void +T::foo () +{ + s.qux (); + s.qux (); +} |