From ef318184241a9f9fd3af394590a468b9850378a0 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 1 Feb 2016 12:39:04 +0000 Subject: [PATCH] =?utf8?q?re=20PR=20tree-optimization/69579=20(gcc=20ICE?= =?utf8?q?=20at=20-O3=20and=20=5F=5Fsigsetjmp=20with=20=E2=80=9Ctree=20che?= =?utf8?q?ck:=20expected=20ssa=5Fname,=20have=20integer=5Fcst=20in=20compu?= =?utf8?q?te=5Foptimized=5Fpartition=5Fbases=E2=80=9D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2016-02-01 Richard Biener 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 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/setjmp-6.c | 25 +++++++++++++++++++++++++ gcc/tree-ssa-loop-ivcanon.c | 4 +++- 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/setjmp-6.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d793391f238..c40db1e4194 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-02-01 Richard Biener + + 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 * postreload.c (reload_cse_simplify): Remove dead code. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6462028e62e..0c1df5e3aa6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-02-01 Richard Biener + + PR tree-optimization/69579 + * gcc.dg/setjmp-6.c: New testcase. + 2016-02-01 Jakub Jelinek PR rtl-optimization/69570 diff --git a/gcc/testsuite/gcc.dg/setjmp-6.c b/gcc/testsuite/gcc.dg/setjmp-6.c new file mode 100644 index 00000000000..0781f055952 --- /dev/null +++ b/gcc/testsuite/gcc.dg/setjmp-6.c @@ -0,0 +1,25 @@ +/* PR69569 */ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +#include + +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; +} diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c index 628d5b1ce47..ab1f7e6d7a9 100644 --- a/gcc/tree-ssa-loop-ivcanon.c +++ b/gcc/tree-ssa-loop-ivcanon.c @@ -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); -- 2.30.2