[Bug rtl-optimization/60268] [4.9 regression] ICE: in rank_for_schedule, at haifa-sched.c:2557

[abel at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60268

--- Comment #4 from Andrey Belevantsev <abel at gcc dot gnu.org> ---

(In reply to Jakub Jelinek from comment #2)

I forgot the single block regions case, so the nr_regions_initial init should
be moved to the bottom of sched_rgn_init.

The check before free_global_sched_pressure_data can be moved before if() like
in the below patch, this way we do not call it each time after we have reset
sched_pressure to NONE for the new regions, or I can drop it altogether, as you
prefer.

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 0573b6a..dc6fa16 100644
--- a/gcc/sched-rgn.c
+++ b/gcc/sched-rgn.c
@@ -1067,7 +1067,6 @@ haifa_find_rgns (void)
        BLOCK_TO_BB (bb->index) = 0;
       }

-  nr_regions_initial = nr_regions;
   free (max_hdr);
   free (degree);
   free (stack);
@@ -2997,10 +2996,10 @@ schedule_region (int rgn)

   /* Do not support register pressure sensitive scheduling for the new regions
      as we don't update the liveness info for them.  */
-  if (rgn >= nr_regions_initial)
+  if (sched_pressure != SCHED_PRESSURE_NONE
+      && rgn >= nr_regions_initial)
     {
-      if (sched_pressure != SCHED_PRESSURE_NONE)
-       free_global_sched_pressure_data ();
+      free_global_sched_pressure_data ();
       sched_pressure = SCHED_PRESSURE_NONE;
     }

@@ -3166,6 +3165,7 @@ sched_rgn_init (bool single_blocks_p)

   RGN_BLOCKS (nr_regions) = (RGN_BLOCKS (nr_regions - 1) +
                             RGN_NR_BLOCKS (nr_regions - 1));
+  nr_regions_initial = nr_regions;
 }

 /* Free data structures for region scheduling.  */