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

re PR tree-optimization/69452 (gcc ICE at -O3 on x86_64-linux-gnu in with verify_ssa failed) 

2016-01-26  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/69452
	* tree-ssa-loop-im.c (move_computations_dom_walker): Remove.
	(move_computations_dom_walker::before_dom_children): Rename
	to ...
	(move_computations_worker): This.
	(move_computations): Perform an RPO rather than a DOM walk.

	* gcc.dg/torture/pr69452.c: New testcase.

From-SVN: r232820
This commit is contained in:
Richard Biener 2016-01-26 11:51:01 +00:00 committed by Richard Biener
parent 6c06e0e822
commit 22a08dd126
4 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2016-01-26 Richard Biener <rguenther@suse.de>
PR tree-optimization/69452
* tree-ssa-loop-im.c (move_computations_dom_walker): Remove.
(move_computations_dom_walker::before_dom_children): Rename
to ...
(move_computations_worker): This.
(move_computations): Perform an RPO rather than a DOM walk.
2016-01-26 Jakub Jelinek <jakub@redhat.com>
PR target/69442

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-01-26 Richard Biener <rguenther@suse.de>
PR tree-optimization/69452
* gcc.dg/torture/pr69452.c: New testcase.
2016-01-26 Jakub Jelinek <jakub@redhat.com>
PR target/69442

35
gcc/testsuite/gcc.dg/torture/pr69452.c Normal file
View File

@ -0,0 +1,35 @@
/* { dg-do compile } */
short a, f, h;
struct S0 {
int f0;
} b;
char c, d, e, j, k;
int g;
char fn1(char p1, int p2) { return 7 >> p2 ? p1 : p2; }
void fn2() {
int l, m, n;
struct S0 o = {0};
for (;;) {
int p = 1, r = e;
unsigned q = 6;
l = r == 0 ? q : q % r;
n = l;
c = f;
k = fn1(p, n ^ e);
char s = k;
j = s / 6;
if (j) {
int t = d, u = m = d ? t : t / d;
h = a || u;
b.f0 = h;
for (; d;)
;
} else {
b = o;
if (d != g)
for (;;)
;
}
}
}

24
gcc/tree-ssa-loop-im.c
View File

@ -1112,15 +1112,16 @@ public:
data stored in LIM_DATA structures associated with each statement. Callback
for walk_dominator_tree. */
edge
move_computations_dom_walker::before_dom_children (basic_block bb)
unsigned int
move_computations_worker (basic_block bb)
{
struct loop *level;
unsigned cost = 0;
struct lim_aux_data *lim_data;
unsigned int todo = 0;
if (!loop_outer (bb->loop_father))
return NULL;
return todo;
for (gphi_iterator bsi = gsi_start_phis (bb); !gsi_end_p (bsi); )
{
@ -1171,7 +1172,7 @@ move_computations_dom_walker::before_dom_children (basic_block bb)
gimple_cond_lhs (cond), gimple_cond_rhs (cond));
new_stmt = gimple_build_assign (gimple_phi_result (stmt),
COND_EXPR, t, arg0, arg1);
todo_ |= TODO_cleanup_cfg;
todo |= TODO_cleanup_cfg;
}
if (INTEGRAL_TYPE_P (TREE_TYPE (gimple_assign_lhs (new_stmt)))
&& (!ALWAYS_EXECUTED_IN (bb)
@ -1266,7 +1267,8 @@ move_computations_dom_walker::before_dom_children (basic_block bb)
else
gsi_insert_on_edge (e, stmt);
}
return NULL;
return todo;
}
/* Hoist the statements out of the loops prescribed by data stored in
@ -1275,14 +1277,20 @@ move_computations_dom_walker::before_dom_children (basic_block bb)
static unsigned int
move_computations (void)
{
move_computations_dom_walker walker (CDI_DOMINATORS);
walker.walk (cfun->cfg->x_entry_block_ptr);
int *rpo = XNEWVEC (int, last_basic_block_for_fn (cfun));
int n = pre_and_rev_post_order_compute_fn (cfun, NULL, rpo, false);
unsigned todo = 0;
for (int i = 0; i < n; ++i)
todo |= move_computations_worker (BASIC_BLOCK_FOR_FN (cfun, rpo[i]));
free (rpo);
gsi_commit_edge_inserts ();
if (need_ssa_update_p (cfun))
rewrite_into_loop_closed_ssa (NULL, TODO_update_ssa);
return walker.todo_;
return todo;
}
/* Checks whether the statement defining variable *INDEX can be hoisted