re PR tree-optimization/51903 (ICE: in gimple_purge_all_dead_eh_edges, at tree-cfg...

2012-01-20  Richard Guenther  <rguenther@suse.de>

	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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e35838a22b53d6ed0be16581d6deb3fe9402db7..030bedbfa219eec93e141a5ba39df0c248db56a1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-20  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/51903
+       * tree-ssa-pre.c (eliminate): Properly purging of EH edges
+       when removing stmts.
+
 2012-01-20  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
        PR target/50313

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2d42abfb4460d9e6d8acea0ab7202308a1e9a7b1..0a726fc9d10a4dfd912de8b101cdb068adb8046f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-20  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/51903
+       * g++.dg/torture/pr51903.C: New testcase.
+
 2012-01-20  Tobias Burnus  <burnus@net-b.de>
            Janus Weil  <janus@gcc.gnu.org>
 

diff --git a/gcc/testsuite/g++.dg/torture/pr51903.C b/gcc/testsuite/g++.dg/torture/pr51903.C
new file mode 100644 (file)
index 0000000..925021b
--- /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 <vector>
+
+void foo ()
+{
+  std::vector < std::vector< int > > (20000);
+}

diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index c5d253c941ae69ce3d4b3000726e8339c7adc8ae..b95ac78385635869a175c414439d03ee6b881043 100644 (file)
--- 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);