re PR tree-optimization/69579 (gcc ICE at -O3 and __sigsetjmp with “tree check: expected ssa_name, have integer_cst in compute_optimized_partition_bases”)

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

	PR tree-optimization/69579
	* tree-ssa-loop-ivcanon.c (propagate_constants_for_unrolling):
	Do not propagate through abnormal PHI results.

	* gcc.dg/setjmp-6.c: New testcase.

From-SVN: r233036
This commit is contained in:
Richard Biener 2016-02-01 12:39:04 +00:00 committed by Richard Biener
parent 571512d5f5
commit ef31818424
4 changed files with 39 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2016-02-01 Richard Biener <rguenther@suse.de>
PR tree-optimization/69579
* tree-ssa-loop-ivcanon.c (propagate_constants_for_unrolling):
Do not propagate through abnormal PHI results.
2016-02-01 Eric Botcazou <ebotcazou@adacore.com>
* postreload.c (reload_cse_simplify): Remove dead code.

View File

@ -1,3 +1,8 @@
2016-02-01 Richard Biener <rguenther@suse.de>
PR tree-optimization/69579
* gcc.dg/setjmp-6.c: New testcase.
2016-02-01 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/69570

View File

@ -0,0 +1,25 @@
/* PR69569 */
/* { dg-do compile } */
/* { dg-options "-O3" } */
#include <setjmp.h>
jmp_buf buf;
struct str {
int Count;
};
int fun2(struct str *p1)
{
int i = 1;
while (1) {
setjmp(buf);
break;
}
for (; i;) {
i = 0;
for (; i < (p1 ? p1->Count : 1); i++)
fun2(p1);
}
return 1;
}

View File

@ -1208,7 +1208,9 @@ propagate_constants_for_unrolling (basic_block bb)
tree result = gimple_phi_result (phi);
tree arg = gimple_phi_arg_def (phi, 0);
if (gimple_phi_num_args (phi) == 1 && TREE_CODE (arg) == INTEGER_CST)
if (! SSA_NAME_OCCURS_IN_ABNORMAL_PHI (result)
&& gimple_phi_num_args (phi) == 1
&& TREE_CODE (arg) == INTEGER_CST)
{
propagate_into_all_uses (result, arg);
gsi_remove (&gsi, true);