re PR tree-optimization/51596 (ICE: verify_flow_info failed: BB 6 can not throw but...

	PR tree-optimization/51596
	* tree-cfg.c (replace_uses_by): Call gimple_purge_dead_eh_edges
	when needed.

	* g++.dg/opt/pr51596.C: New test.

From-SVN: r182481

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40415075999abc0eb36860e6304b5af184522d4f..57f9e4e2b08a6e30d9081c188e4ca9e0da9e6b72 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-19  Jakub Jelinek  <jakub@redhat.com>
 
+       PR tree-optimization/51596
+       * tree-cfg.c (replace_uses_by): Call gimple_purge_dead_eh_edges
+       when needed.
+
        PR middle-end/51590
        PR tree-optimization/51606
        * tree-vect-patterns.c (append_pattern_def_seq, new_pattern_def_seq):

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 97523280bb680ee6a91589a7f4328a2fb81b6cc2..a7c1c48a37cf871f55cccc0169c1d95d81bb5caf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-19  Jakub Jelinek  <jakub@redhat.com>
 
+       PR tree-optimization/51596
+       * g++.dg/opt/pr51596.C: New test.
+
        PR middle-end/51590
        PR tree-optimization/51606
        * gcc.dg/vect/pr51590.c: New test.

diff --git a/gcc/testsuite/g++.dg/opt/pr51596.C b/gcc/testsuite/g++.dg/opt/pr51596.C
new file mode 100644 (file)
index 0000000..2ed9481
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr51596.C
@@ -0,0 +1,39 @@
+// PR tree-optimization/51596
+// { dg-do compile }
+// { dg-options "-O -fnon-call-exceptions" }
+
+struct A { float v[2]; };
+struct B { int v[2]; };
+
+struct C
+{
+  B c;
+  C f ()
+  {
+    B b;
+    for (int i = 0; i < 2; i++)
+      b.v[i] = c.v[i];
+    return *this;
+  }
+};
+
+struct D
+{
+  A d;
+  D (B x)
+  {
+    for (int i = 0; i < 2; i++)
+      d.v[i] = x.v[i];
+  }
+};
+
+int bar ();
+
+C i;
+
+void
+foo ()
+{
+  while (bar ())
+    D (i.f ().c);
+}

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index cd779427b0f1f9803efb6ccfcd9ebfef8340769d..df5695c2ec707036eaf40ed489805217b0d46a40 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1627,7 +1627,8 @@ replace_uses_by (tree name, tree val)
          if (fold_stmt (&gsi))
            stmt = gsi_stmt (gsi);
 
-         maybe_clean_or_replace_eh_stmt (orig_stmt, stmt);
+         if (maybe_clean_or_replace_eh_stmt (orig_stmt, stmt))
+           gimple_purge_dead_eh_edges (gimple_bb (stmt));
 
          update_stmt (stmt);
        }