OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR rtl-optimization/48302 (ICE: SIGSEGV in reposition_prologue_and_epilogue_notes (function.c:5662) with -fcrossjumping -fselective-scheduling2)

Browse Source 
PR rtl-optimization/48302
	* sel-sched-ir.h (sel_add_loop_preheaders): Update prototype.
	* sel-sched-ir.c (sel_add_loop_preheaders): Add 'bbs' argument.  Use
	it to record added preheader blocks.
	* sel-sched.c (setup_current_loop_nest): Add 'bbs' argument.  Pass it
	on to sel_add_loop_preheaders.
	(sel_region_init): Move call to setup_current_loop_nest after
	sel_init_bbs.

testsuite:
	* g++.dg/opt/pr48302.C: New.

From-SVN: r172176
This commit is contained in:
Alexander Monakov 2011-04-08 15:53:25 +04:00 committed by Alexander Monakov
parent 07643d76c7
commit ea4d630fef
6 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2011-04-08 Alexander Monakov <amonakov@ispras.ru>
PR rtl-optimization/48302
* sel-sched-ir.h (sel_add_loop_preheaders): Update prototype.
* sel-sched-ir.c (sel_add_loop_preheaders): Add 'bbs' argument. Use
it to record added preheader blocks.
* sel-sched.c (setup_current_loop_nest): Add 'bbs' argument. Pass it
on to sel_add_loop_preheaders.
(sel_region_init): Move call to setup_current_loop_nest after
sel_init_bbs.
2011-04-08 Alexander Monakov <amonakov@ispras.ru>
PR target/48273

7
gcc/sel-sched-ir.c
View File

@ -6094,11 +6094,11 @@ sel_find_rgns (void)
bbs_in_loop_rgns = NULL;
}
/* Adds the preheader blocks from previous loop to current region taking
it from LOOP_PREHEADER_BLOCKS (current_loop_nest).
/* Add the preheader blocks from previous loop to current region taking
it from LOOP_PREHEADER_BLOCKS (current_loop_nest) and record them in *BBS.
This function is only used with -fsel-sched-pipelining-outer-loops. */
void
sel_add_loop_preheaders (void)
sel_add_loop_preheaders (bb_vec_t *bbs)
{
int i;
basic_block bb;
@ -6109,6 +6109,7 @@ sel_add_loop_preheaders (void)
VEC_iterate (basic_block, preheader_blocks, i, bb);
i++)
{
VEC_safe_push (basic_block, heap, *bbs, bb);
VEC_safe_push (basic_block, heap, last_added_blocks, bb);
sel_add_bb (bb);
}

2
gcc/sel-sched-ir.h
View File

@ -1628,7 +1628,7 @@ extern void sel_sched_region (int);
extern loop_p get_loop_nest_for_rgn (unsigned int);
extern bool considered_for_pipelining_p (struct loop *);
extern void make_region_from_loop_preheader (VEC(basic_block, heap) **);
extern void sel_add_loop_preheaders (void);
extern void sel_add_loop_preheaders (bb_vec_t *);
extern bool sel_is_loop_preheader_p (basic_block);
extern void clear_outdated_rtx_info (basic_block);
extern void free_data_sets (basic_block);

10
gcc/sel-sched.c
View File

@ -6801,7 +6801,7 @@ current_region_empty_p (void)
/* Prepare and verify loop nest for pipelining. */
static void
setup_current_loop_nest (int rgn)
setup_current_loop_nest (int rgn, bb_vec_t *bbs)
{
current_loop_nest = get_loop_nest_for_rgn (rgn);
@ -6810,7 +6810,7 @@ setup_current_loop_nest (int rgn)
/* If this loop has any saved loop preheaders from nested loops,
add these basic blocks to the current region. */
sel_add_loop_preheaders ();
sel_add_loop_preheaders (bbs);
/* Check that we're starting with a valid information. */
gcc_assert (loop_latch_edge (current_loop_nest));
@ -6849,9 +6849,6 @@ sel_region_init (int rgn)
if (current_region_empty_p ())
return true;
if (flag_sel_sched_pipelining)
setup_current_loop_nest (rgn);
sel_setup_region_sched_flags ();
bbs = VEC_alloc (basic_block, heap, current_nr_blocks);
@ -6861,6 +6858,9 @@ sel_region_init (int rgn)
sel_init_bbs (bbs, NULL);
if (flag_sel_sched_pipelining)
setup_current_loop_nest (rgn, &bbs);
/* Initialize luids and dependence analysis which both sel-sched and haifa
need. */
sched_init_luids (bbs, NULL, NULL, NULL);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-04-08 Alexander Monakov <amonakov@ispras.ru>
PR rtl-optimization/48302
* g++.dg/opt/pr48302.C: New.
2011-04-08 Alexander Monakov <amonakov@ispras.ru>
PR target/48273

21
gcc/testsuite/g++.dg/opt/pr48302.C Normal file
View File

@ -0,0 +1,21 @@
// { dg-do compile { target powerpc*-*-* ia64-*-* x86_64-*-* } }
// { dg-options "-O -fcrossjumping -fgcse -fschedule-insns2 -fsel-sched-pipelining -fsel-sched-pipelining-outer-loops -fselective-scheduling2 --param lim-expensive=320 --param min-crossjump-insns=1" }
struct S
{
int i, j;
S *s;
~S();
};
S *gs;
void foo ()
{
restart:
for (S *s = gs; s; s = s->s)
if (s->j && s->j != (s->i & 1)) {
delete s;
goto restart;
}
}