re PR rtl-optimization/60268 (ICE: in rank_for_schedule, at haifa-sched.c:2557)

gcc/

2014-02-24  Andrey Belevantsev  <abel@ispras.ru>

    PR rtl-optimization/60268
    * sched-rgn.c (haifa_find_rgns): Move the nr_regions_initial variable
    initialization to ...
    (sched_rgn_init): ... here.
    (schedule_region): Check for SCHED_PRESSURE_NONE earlier.

testsuite/

2014-02-24  Andrey Belevantsev  <abel@ispras.ru>

    PR rtl-optimization/60268
    * gcc.c-torture/compile/pr60268.c: New test.

From-SVN: r208066

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 748805e620ee53d843dc418260b308634421689a..dd9415b76c7580cd3fd250c589fb42789cf66768 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,15 @@
+2014-02-24  Andrey Belevantsev  <abel@ispras.ru>
+
+       PR rtl-optimization/60268
+       * sched-rgn.c (haifa_find_rgns): Move the nr_regions_initial variable
+       initialization to ...
+       (sched_rgn_init): ... here.
+       (schedule_region): Check for SCHED_PRESSURE_NONE earlier.
+
 2014-02-23  David Holsgrove <david.holsgrove@xilinx.com>
 
-       * config/microblaze/microblaze.md: Correct ashrsi_reg / lshrsi_reg names
+       * config/microblaze/microblaze.md: Correct ashrsi_reg / lshrsi_reg
+       names.
 
 2014-02-23  Edgar E. Iglesias <edgar.iglesias@xilinx.com>
 

diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c
index 0573b6a6e8f77a94e0f7b75d44300d1fbc41cfce..dc6fa16a19e4ec03418e9a957c9008e03373e225 100644 (file)
--- 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.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f3c0c851c0f47703a2f2b367be404a8d410d138f..e60f3826768357bdab3b7bcf2682fb6ecde2232e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,11 @@
+2014-02-24  Andrey Belevantsev  <abel@ispras.ru>
+
+       PR rtl-optimization/60268
+       * gcc.c-torture/compile/pr60268.c: New test.
+
 2014-02-23  David Holsgrove <david.holsgrove@xilinx.com>
 
-       * gcc/testsuite/gcc.target/microblaze/others/mem_reload.c: New test.
+       * gcc.target/microblaze/others/mem_reload.c: New test.
 
 2014-02-23  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr60268.c b/gcc/testsuite/gcc.c-torture/compile/pr60268.c
new file mode 100644 (file)
index 0000000..c3a6f94
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr60268.c
@@ -0,0 +1,6 @@
+/* { dg-options "-flive-range-shrinkage" } */
+void f()
+{
+  int i = 0;
+  void *p = 0;
+}