re PR rtl-optimization/42388 (ICE in move_bb_info with sel-sched and modulo-sched...

        PR rtl-optimization/42388
        * sel-sched-ir.c (maybe_tidy_empty_bb): Do not delete empty blocks
        that have no predecessors nor successors.  Do not call move_bb_info
        for empty blocks outside of current region.

From-SVN: r155894

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8bd4c97f7eff0265c2b30e3ef12fa6ebcf72c0e..eb096499c85f08c6e816d3303f72c4d925162444 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-14  Andrey Belevantsev  <abel@ispras.ru>
+
+       PR rtl-optimization/42388
+       * sel-sched-ir.c (maybe_tidy_empty_bb): Do not delete empty blocks
+       that have no predecessors nor successors.  Do not call move_bb_info
+       for empty blocks outside of current region.
+
 2010-01-14  Alexander Monakov  <amonakov@ispras.ru>
 
        PR rtl-optimization/42294

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 218c04e5bf197817e7e7abf5bfd1236c9f0ea3db..1353b4cfc65bfd4a0a1e8e5adc0eed1c06fc0d94 100644 (file)
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -3540,12 +3540,15 @@ maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
   bool rescan_p;
 
   /* Keep empty bb only if this block immediately precedes EXIT and
-     has incoming non-fallthrough edge.  Otherwise remove it.  */
+     has incoming non-fallthrough edge, or it has no predecessors or
+     successors.  Otherwise remove it.  */
   if (!sel_bb_empty_p (bb)
       || (single_succ_p (bb)
           && single_succ (bb) == EXIT_BLOCK_PTR
           && (!single_pred_p (bb)
-              || !(single_pred_edge (bb)->flags & EDGE_FALLTHRU))))
+              || !(single_pred_edge (bb)->flags & EDGE_FALLTHRU)))
+      || EDGE_COUNT (bb->preds) == 0
+      || EDGE_COUNT (bb->succs) == 0)
     return false;
 
   /* Do not attempt to redirect complex edges.  */
@@ -3595,7 +3598,8 @@ maybe_tidy_empty_bb (basic_block bb, bool recompute_toporder_p)
     {
       gcc_assert (pred_bb != NULL);
 
-      move_bb_info (pred_bb, bb);
+      if (in_current_region_p (pred_bb))
+       move_bb_info (pred_bb, bb);
       remove_empty_bb (bb, true);
     }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6389af52eaf3263107d62e8bfe2199486deb9528..dfc02daad65c183d0e73102b69a1380b65de11be 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Alexander Monakov  <amonakov@ispras.ru>
+
+       PR rtl-optimization/42388
+       * gcc.dg/pr42388.c: New.
+
 2010-01-14  Alexander Monakov <amonakov@ispras.ru>
 
        PR rtl-optimization/42294

diff --git a/gcc/testsuite/gcc.dg/pr42388.c b/gcc/testsuite/gcc.dg/pr42388.c
new file mode 100644 (file)
index 0000000..ad97eb4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr42388.c
@@ -0,0 +1,67 @@
+/* { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } */
+/* { dg-options "-O2 -fselective-scheduling -fmodulo-sched" } */
+
+enum rtx_code
+{
+  INSN, ADDR_VEC, ADDR_DIFF_VEC, CALL_INSN, CODE_LABEL, BARRIER, NOTE
+};
+typedef union rtunion_def
+{
+  int rtint;
+  char *rtstr;
+  struct rtx_def *rtx;
+  struct rtvec_def *rtvec;
+}
+rtunion;
+typedef struct rtx_def
+{
+  unsigned short code;
+  rtunion fld[1];
+}
+ *rtx;
+typedef struct rtvec_def
+{
+  unsigned num_elem;
+  rtunion elem[1];
+}
+ *rtvec;
+extern rtx emit_barrier (void);
+extern rtx emit_note (char *);
+
+static void
+copy_loop_body (rtx *map)
+{
+  int i;
+  rtx insn, copy;
+  rtx pat = copy->fld[3].rtx;
+
+  switch (insn->code)
+    {
+    case INSN:
+      if (insn->fld[7].rtx)
+       {
+       }
+      else if (pat->code == ADDR_VEC || pat->code == ADDR_DIFF_VEC)
+       {
+         int diff_vec_p = pat->code == ADDR_DIFF_VEC;
+         int len = pat->fld[diff_vec_p].rtvec->num_elem;
+         for (i = 0; i < len; i++)
+           pat->fld[diff_vec_p].rtvec->elem[i].rtx->fld[5].rtint++;
+       }
+    case CALL_INSN:
+      for (i = 0; i < 64; i++)
+       map[i] = 0;
+    case CODE_LABEL:
+    case BARRIER:
+      copy = emit_barrier ();
+    case NOTE:
+      copy = emit_note ("x");
+    }
+}
+void
+unroll_loop (int insn_count, rtx *map)
+{
+  if (insn_count > 50)
+    copy_loop_body (map);
+}
+