From: Andrey Belevantsev Date: Thu, 7 Apr 2011 07:01:25 +0000 (+0400) Subject: backport: re PR rtl-optimization/46649 (ICE: in move_bb_info, at sel-sched-ir.c:5080... X-Git-Tag: releases/gcc-4.5.3~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=144f6c6ec95f680f3c052a67d28b0e7b1e01c458;p=thirdparty%2Fgcc.git backport: re PR rtl-optimization/46649 (ICE: in move_bb_info, at sel-sched-ir.c:5080 with -fschedule-insns -fselective-scheduling) Backport from mainline 2010-12-15 Alexander Monakov PR rtl-optimization/46649 * sel-sched-ir.c (purge_empty_blocks): Unconditionally skip the first basic block in the region. From-SVN: r172086 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 90f310ae051d..b4b968e36988 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2011-04-07 Andrey Belevantsev + + Backport from mainline + 2010-12-15 Alexander Monakov + + PR rtl-optimization/46649 + * sel-sched-ir.c (purge_empty_blocks): Unconditionally skip the first + basic block in the region. + 2011-04-07 Andrey Belevantsev Backport from mainline diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c index 4c3d94a73609..8ec8444d13a8 100644 --- a/gcc/sel-sched-ir.c +++ b/gcc/sel-sched-ir.c @@ -3746,10 +3746,10 @@ tidy_control_flow (basic_block xbb, bool full_tidying) void purge_empty_blocks (void) { - /* Do not attempt to delete preheader. */ - int i = sel_is_loop_preheader_p (BASIC_BLOCK (BB_TO_BLOCK (0))) ? 1 : 0; + int i; - while (i < current_nr_blocks) + /* Do not attempt to delete the first basic block in the region. */ + for (i = 1; i < current_nr_blocks; ) { basic_block b = BASIC_BLOCK (BB_TO_BLOCK (i)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ea578fabf131..9fb4112e1c67 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2011-04-07 Andrey Belevantsev + + Backport from mainline + 2010-12-15 Alexander Monakov + + PR rtl-optimization/46649 + * g++.dg/opt/pr46649.C: New. + 2011-04-07 Andrey Belevantsev Backport from mainline diff --git a/gcc/testsuite/g++.dg/opt/pr46649.C b/gcc/testsuite/g++.dg/opt/pr46649.C new file mode 100644 index 000000000000..1428e8bddbec --- /dev/null +++ b/gcc/testsuite/g++.dg/opt/pr46649.C @@ -0,0 +1,9 @@ +// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } } +// { dg-options "-fschedule-insns -fselective-scheduling" } + +void foo () +{ + for (;;) + for (;;({break;})) + ; +}