2012-04-02 Richard Guenther <rguenther@suse.de>

	PR middle-end/52803
	* loop-init.c (gate_handle_loop2): Destroy loops here if
	we don't enter RTL loop optimizers.

	* gcc.dg/pr52803.c: New testcase.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186080 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5abe45..ef6425c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-02  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/52803
+       * loop-init.c (gate_handle_loop2): Destroy loops here if
+       we don't enter RTL loop optimizers.
+
 2012-04-02  Uros Bizjak  <ubizjak@gmail.com>
 
        Partially revert:

diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index b8d7b7e..03f8f61 100644 (file)
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -158,15 +158,24 @@ loop_optimizer_finalize (void)
 static bool
 gate_handle_loop2 (void)
 {
-  return (optimize > 0
-         && (flag_move_loop_invariants
-              || flag_unswitch_loops
-              || flag_peel_loops
-              || flag_unroll_loops
+  if (optimize > 0
+      && (flag_move_loop_invariants
+         || flag_unswitch_loops
+         || flag_peel_loops
+         || flag_unroll_loops
 #ifdef HAVE_doloop_end
-             || (flag_branch_on_count_reg && HAVE_doloop_end)
+         || (flag_branch_on_count_reg && HAVE_doloop_end)
 #endif
-             ));
+        ))
+    return true;
+  else
+    {
+      /* No longer preserve loops, remove them now.  */
+      cfun->curr_properties &= ~PROP_loops;
+      if (current_loops)
+       loop_optimizer_finalize ();
+      return false;
+    } 
 }
 
 struct rtl_opt_pass pass_loop2 =

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bfad9a7..2d95e0e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-02  Richard Guenther  <rguenther@suse.de>
+
+       PR middle-end/52803
+       * gcc.dg/pr52803.c: New testcase.
+
 2012-04-02  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/40942

diff --git a/gcc/testsuite/gcc.dg/pr52803.c b/gcc/testsuite/gcc.dg/pr52803.c
new file mode 100644 (file)
index 0000000..6774b0c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr52803.c
@@ -0,0 +1,4 @@
+/* { dg-do compile } */
+/* { dg-options "-O -fno-move-loop-invariants" } */
+
+int main () { return 0; }