re PR middle-end/66375 (wrong code at -O2 and -O3 on x86_64-linux-gnu)

2015-06-03  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/66375
	* tree-scalar-evolution.c (follow_ssa_edge_binary): First
	add to the evolution before following SSA edges.

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

From-SVN: r224060
This commit is contained in:
Richard Biener 2015-06-03 07:57:13 +00:00 committed by Richard Biener
parent e185f450b8
commit b9b79ba426
4 changed files with 49 additions and 27 deletions

View File

@ -1,3 +1,9 @@
2015-06-03 Richard Biener <rguenther@suse.de>
PR tree-optimization/66375
* tree-scalar-evolution.c (follow_ssa_edge_binary): First
add to the evolution before following SSA edges.
2015-06-03 Bin Cheng <bin.cheng@arm.com>
* tree-ssa-loop-ivopts.c (dump_iv): New parameter.

View File

@ -1,3 +1,8 @@
2015-06-03 Richard Biener <rguenther@suse.de>
PR tree-optimization/66375
* gcc.dg/torture/pr66375.c: New testcase.
2015-06-03 Bin Cheng <bin.cheng@arm.com>
* gcc.dg/tree-ssa/pr65447.c: Increase searching number.

View File

@ -0,0 +1,13 @@
/* { dg-do run } */
int a;
extern void abort (void);
int main ()
{
int c = 0;
for (; a < 13; ++a)
c = (signed char)c - 11;
if (c != 113)
abort ();
return 0;
}

View File

@ -958,27 +958,25 @@ follow_ssa_edge_binary (struct loop *loop, gimple at_stmt,
limit++;
evol = *evolution_of_loop;
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs0), halting_phi, &evol, limit);
if (res == t_true)
*evolution_of_loop = add_to_evolution
evol = add_to_evolution
(loop->num,
chrec_convert (type, evol, at_stmt),
code, rhs1, at_stmt);
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs0), halting_phi, &evol, limit);
if (res == t_true)
*evolution_of_loop = evol;
else if (res == t_false)
{
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs1), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
*evolution_of_loop = add_to_evolution
(loop->num,
chrec_convert (type, *evolution_of_loop, at_stmt),
code, rhs0, at_stmt);
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs1), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
;
else if (res == t_dont_know)
*evolution_of_loop = chrec_dont_know;
}
@ -991,15 +989,15 @@ follow_ssa_edge_binary (struct loop *loop, gimple at_stmt,
{
/* Match an assignment under the form:
"a = b + ...". */
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs0), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
*evolution_of_loop = add_to_evolution
(loop->num, chrec_convert (type, *evolution_of_loop,
at_stmt),
code, rhs1, at_stmt);
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs0), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
;
else if (res == t_dont_know)
*evolution_of_loop = chrec_dont_know;
}
@ -1009,15 +1007,15 @@ follow_ssa_edge_binary (struct loop *loop, gimple at_stmt,
{
/* Match an assignment under the form:
"a = ... + c". */
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs1), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
*evolution_of_loop = add_to_evolution
(loop->num, chrec_convert (type, *evolution_of_loop,
at_stmt),
code, rhs0, at_stmt);
res = follow_ssa_edge
(loop, SSA_NAME_DEF_STMT (rhs1), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
;
else if (res == t_dont_know)
*evolution_of_loop = chrec_dont_know;
}
@ -1042,13 +1040,13 @@ follow_ssa_edge_binary (struct loop *loop, gimple at_stmt,
if (TREE_CODE (rhs1) == SSA_NAME)
limit++;
res = follow_ssa_edge (loop, SSA_NAME_DEF_STMT (rhs0), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
*evolution_of_loop = add_to_evolution
(loop->num, chrec_convert (type, *evolution_of_loop, at_stmt),
MINUS_EXPR, rhs1, at_stmt);
res = follow_ssa_edge (loop, SSA_NAME_DEF_STMT (rhs0), halting_phi,
evolution_of_loop, limit);
if (res == t_true)
;
else if (res == t_dont_know)
*evolution_of_loop = chrec_dont_know;
}