From a88b3135730c7e2334812b9e4ec5631f00446015 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 20 Jan 2012 10:10:46 +0000 Subject: [PATCH] re PR tree-optimization/51903 (ICE: in gimple_purge_all_dead_eh_edges, at tree-cfg.c:7196 with -fnon-call-exceptions) 2012-01-20 Richard Guenther PR tree-optimization/51903 * tree-ssa-pre.c (eliminate): Properly purging of EH edges when removing stmts. * g++.dg/torture/pr51903.C: New testcase. From-SVN: r183329 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/torture/pr51903.C | 9 +++++++++ gcc/tree-ssa-pre.c | 6 ++++-- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/torture/pr51903.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e35838a22b..030bedbfa21 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-01-20 Richard Guenther + + PR tree-optimization/51903 + * tree-ssa-pre.c (eliminate): Properly purging of EH edges + when removing stmts. + 2012-01-20 Ramana Radhakrishnan PR target/50313 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2d42abfb446..0a726fc9d10 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-20 Richard Guenther + + PR tree-optimization/51903 + * g++.dg/torture/pr51903.C: New testcase. + 2012-01-20 Tobias Burnus Janus Weil diff --git a/gcc/testsuite/g++.dg/torture/pr51903.C b/gcc/testsuite/g++.dg/torture/pr51903.C new file mode 100644 index 00000000000..925021b7e4b --- /dev/null +++ b/gcc/testsuite/g++.dg/torture/pr51903.C @@ -0,0 +1,9 @@ +// { dg-do compile } +// { dg-options "-O2 -fnon-call-exceptions -fno-guess-branch-probability" } + +#include + +void foo () +{ + std::vector < std::vector< int > > (20000); +} diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index c5d253c941a..b95ac783856 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -4541,8 +4541,10 @@ eliminate (void) gsi = gsi_for_stmt (stmt); unlink_stmt_vdef (stmt); gsi_remove (&gsi, true); - if (gimple_purge_dead_eh_edges (bb)) - todo |= TODO_cleanup_cfg; + /* ??? gsi_remove doesn't tell us whether the stmt was + in EH tables and thus whether we need to purge EH edges. + Simply schedule the block for a cleanup. */ + bitmap_set_bit (need_eh_cleanup, bb->index); if (TREE_CODE (lhs) == SSA_NAME) bitmap_clear_bit (inserted_exprs, SSA_NAME_VERSION (lhs)); release_defs (stmt);