backport: re PR tree-optimization/46864 (ICE: verify_stmts failed: statement marked...

	Backport from mainline
	2010-12-10  Jakub Jelinek  <jakub@redhat.com>

	PR tree-optimization/46864
	* tree-ssa-loop-im.c (loop_suitable_for_sm): Return false even
	when there are EDGE_EH exit edges.

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

From-SVN: r168861

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3caa6c65a5e56a8f501a27c95de4cebd38d389df..ed1b160e3b414da6a23bfec2720f8adbdb889e89 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,12 @@
 2011-01-16  Jakub Jelinek  <jakub@redhat.com>
 
        Backport from mainline
+       2010-12-10  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/46864
+       * tree-ssa-loop-im.c (loop_suitable_for_sm): Return false even
+       when there are EDGE_EH exit edges.
+
        2010-12-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/41082

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 26b63f300ef8ca0bb632c4bcc734ece2d01127ca..8d011dd6e5ee5a92bfef8e751613684424caea67 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-16  Jakub Jelinek  <jakub@redhat.com>
+
+       Backport from mainline
+       2010-12-10  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/46864
+       * g++.dg/opt/pr46864.C: New test.
+
 2011-01-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * gfortran.dg/cray_pointers_2.f90: Use dg-timeout-factor 4.

diff --git a/gcc/testsuite/g++.dg/opt/pr46864.C b/gcc/testsuite/g++.dg/opt/pr46864.C
new file mode 100644 (file)
index 0000000..0f7b7d2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/opt/pr46864.C
@@ -0,0 +1,26 @@
+// PR tree-optimization/46864
+// { dg-do compile }
+// { dg-options "-O -fnon-call-exceptions" }
+
+int baz ();
+
+struct S
+{
+  int k;
+  bool bar () throw ()
+  {
+    int m = baz ();
+    for (int i = 0; i < m; i++)
+      k = i;
+    return m;
+  }
+};
+
+extern S *s;
+
+void
+foo ()
+{
+  while (baz () && s->bar ())
+    ;
+}

diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c
index 90b3a38b448b38e2351aff67982b8e404c5fd039..720159368381d9f82162cc68449d9efb754ffe21 100644 (file)
--- a/gcc/tree-ssa-loop-im.c
+++ b/gcc/tree-ssa-loop-im.c
@@ -2139,7 +2139,7 @@ loop_suitable_for_sm (struct loop *loop ATTRIBUTE_UNUSED,
   edge ex;
 
   for (i = 0; VEC_iterate (edge, exits, i, ex); i++)
-    if (ex->flags & EDGE_ABNORMAL)
+    if (ex->flags & (EDGE_ABNORMAL | EDGE_EH))
       return false;
 
   return true;