diff options
| author | Andrey Belevantsev <abel@gcc.gnu.org> | 2014-02-24 09:57:02 +0400 |
|---|---|---|
| committer | Andrey Belevantsev <abel@gcc.gnu.org> | 2014-02-24 09:57:02 +0400 |
| commit | 9039622a9d456ec9719ec22372e0ec22a8fb6ded (patch) | |
| tree | 4e4b38d31417de3db52142b6f3e4e5a802536d6d | |
| parent | 467d193f936fefd55cfee62e250482388606cfcb (diff) | |
| download | gcc-9039622a9d456ec9719ec22372e0ec22a8fb6ded.zip gcc-9039622a9d456ec9719ec22372e0ec22a8fb6ded.tar.gz gcc-9039622a9d456ec9719ec22372e0ec22a8fb6ded.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/sched-rgn.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.c-torture/compile/pr60268.c | 6 |
4 files changed, 26 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 748805e..dd9415b 100644 --- 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 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. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f3c0c85..e60f382 100644 --- 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 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; +} |