backport: re PR rtl-optimization/46602 (gcc.dg/pr42245-2.c ICE on ia64)

        Backport from mainline
        2010-11-25  Alexander Monakov  <amonakov@ispras.ru>

        PR rtl-optimization/46602
        * sel-sched-ir.c (maybe_tidy_empty_bb): Move checking ...
        (tidy_control_flow): Here.

From-SVN: r172081

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 93e477f684d9bc37759a7456640ed5b33efc8df9..64abc47f02f0f66476637a6916288f087f91d1b8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-07  Andrey Belevantsev  <abel@ispras.ru>
+
+       Backport from mainline
+       2010-11-25  Alexander Monakov  <amonakov@ispras.ru>
+
+       PR rtl-optimization/46602
+       * sel-sched-ir.c (maybe_tidy_empty_bb): Move checking ...
+       (tidy_control_flow): Here.
+
 2011-04-07  Andrey Belevantsev  <abel@ispras.ru>
 
        Backport from mainline

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 6e54568c1048426ea096321f76c47a70ad49a2c1..0c40eb539f20b63aefd74482ca872bc9c14ef433 100644 (file)
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -3629,10 +3629,6 @@ maybe_tidy_empty_bb (basic_block bb)
       remove_empty_bb (bb, true);
     }
 
-#ifdef ENABLE_CHECKING
-  verify_backedges ();
-#endif
-
   return true;
 }
 
@@ -3714,6 +3710,9 @@ tidy_control_flow (basic_block xbb, bool full_tidying)
       if (recompute_toporder_p)
        sel_recompute_toporder ();
     }
+#ifdef ENABLE_CHECKING
+  verify_backedges ();
+#endif
 
   return changed;
 }