From 225820eef430341b6b8136164f6272e25934609a Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Mon, 2 Apr 2012 11:59:47 +0000 Subject: [PATCH] re PR rtl-optimization/52803 (ICE: in ira, at ira.c:3616 with -fno-move-loop-invariants on almost any code) 2012-04-02 Richard Guenther 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. From-SVN: r186080 --- gcc/ChangeLog | 6 ++++++ gcc/loop-init.c | 23 ++++++++++++++++------- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr52803.c | 4 ++++ 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr52803.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e5abe45..ef6425c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-04-02 Richard Guenther + + 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 Partially revert: diff --git a/gcc/loop-init.c b/gcc/loop-init.c index b8d7b7e..03f8f61 100644 --- 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 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-04-02 Richard Guenther + + PR middle-end/52803 + * gcc.dg/pr52803.c: New testcase. + 2012-04-02 Dodji Seketeli PR c++/40942 diff --git a/gcc/testsuite/gcc.dg/pr52803.c b/gcc/testsuite/gcc.dg/pr52803.c new file mode 100644 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; } -- 2.7.4