diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-09-02 21:13:47 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-09-02 21:13:47 +0200 |
| commit | 833ee764e77be266b6383feb9fd6cabf40a539b8 (patch) | |
| tree | bc95697242e4ceed489101dcfdecd02359c3dcbd /gcc | |
| parent | c83c7e7e47f2a1618ea5ab1e6fc78df66b22f285 (diff) | |
| download | gcc-833ee764e77be266b6383feb9fd6cabf40a539b8.zip gcc-833ee764e77be266b6383feb9fd6cabf40a539b8.tar.gz gcc-833ee764e77be266b6383feb9fd6cabf40a539b8.tar.bz2 | |
re PR tree-optimization/36766 (natGC.cc:229: internal compiler error: Segmentation fault)
PR tree-optimization/36766
* tree-cfg.c (gimple_purge_all_dead_eh_edges): Do nothing
for already removed basic blocks.
* g++.dg/tree-ssa/pr36766.C: New test.
From-SVN: r139908
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/tree-ssa/pr36766.C | 31 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 8 |
4 files changed, 45 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 670d5f3..4f53209 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2008-09-02 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/36766 + * tree-cfg.c (gimple_purge_all_dead_eh_edges): Do nothing + for already removed basic blocks. + PR target/36332 * real.c (real_maxval): Clear a lower bit to make real_maxval match get_max_float for IBM long double format. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f9fdc55..d5c853f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2008-09-02 Jakub Jelinek <jakub@redhat.com> + PR tree-optimization/36766 + * g++.dg/tree-ssa/pr36766.C: New test. + PR target/36332 * gcc.c-torture/execute/ieee/pr36332.c: New test. diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr36766.C b/gcc/testsuite/g++.dg/tree-ssa/pr36766.C new file mode 100644 index 0000000..37e0d51 --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr36766.C @@ -0,0 +1,31 @@ +// PR tree-optimization/36766 +// { dg-do compile } +// { dg-options "-O -fnon-call-exceptions" } + +struct A +{ + ~A () + { + int *a = this->b; + } + int *b; +}; + +struct B : A +{ + B () + { + int *a = this->b; + } + ~B () + { + int *a = this->b; + } +}; + +void +foo () +{ + B *c = new B; + delete c; +} diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index f63e676..6bd8a06 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -6560,7 +6560,13 @@ gimple_purge_all_dead_eh_edges (const_bitmap blocks) EXECUTE_IF_SET_IN_BITMAP (blocks, 0, i, bi) { - changed |= gimple_purge_dead_eh_edges (BASIC_BLOCK (i)); + basic_block bb = BASIC_BLOCK (i); + + /* Earlier gimple_purge_dead_eh_edges could have removed + this basic block already. */ + gcc_assert (bb || changed); + if (bb != NULL) + changed |= gimple_purge_dead_eh_edges (bb); } return changed; |