diff options
| author | Richard Biener <rguenther@suse.de> | 2017-09-19 11:57:39 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2017-09-19 11:57:39 +0000 |
| commit | 109bb9107bc49ad4d396c387dd29fa9f6eeb9c39 (patch) | |
| tree | f82639aeed94496688ffd3da48cb39012e5ba13e /gcc | |
| parent | ffaea1170332667a1533a354dfcedc6d0de4aa5e (diff) | |
| download | gcc-109bb9107bc49ad4d396c387dd29fa9f6eeb9c39.zip gcc-109bb9107bc49ad4d396c387dd29fa9f6eeb9c39.tar.gz gcc-109bb9107bc49ad4d396c387dd29fa9f6eeb9c39.tar.bz2 | |
re PR tree-optimization/82244 (-O2: ICE: tree check: expected ssa_name, have integer_cst in replace_uses_by, at tree-cfg.c:1904)
2017-09-19 Richard Biener <rguenther@suse.de>
PR tree-optimization/82244
* tree-vrp.c (remove_range_assertions): Do not propagate
a constant to abnormals but replace the assert with a copy.
* gcc.dg/torture/pr82244.c: New testcase.
From-SVN: r252973
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr82244.c | 31 | ||||
| -rw-r--r-- | gcc/tree-vrp.c | 8 |
4 files changed, 50 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc732f9..98806a3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-09-19 Richard Biener <rguenther@suse.de> + + PR tree-optimization/82244 + * tree-vrp.c (remove_range_assertions): Do not propagate + a constant to abnormals but replace the assert with a copy. + 2017-09-19 Alexander Monakov <amonakov@ispras.ru> PR rtl-optimization/57878 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index aa6c725..a9e49e2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2017-09-19 Richard Biener <rguenther@suse.de> + PR tree-optimization/82244 + * gcc.dg/torture/pr82244.c: New testcase. + +2017-09-19 Richard Biener <rguenther@suse.de> + PR tree-optimization/69728 * gfortran.dg/graphite/pr69728.f90: New testcase. * gcc.dg/graphite/pr69728.c: Likewise. diff --git a/gcc/testsuite/gcc.dg/torture/pr82244.c b/gcc/testsuite/gcc.dg/torture/pr82244.c new file mode 100644 index 0000000..3b385f9 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr82244.c @@ -0,0 +1,31 @@ +/* { dg-do compile } */ + +typedef struct a { + struct a *b; +} a; + +extern int d(void); +extern int g(void); +extern int h(void); +extern int _setjmp(void *); + +int c(void) +{ + 1 ? d() : 0; + + a *e; + while (e) { + e = (e == (a *) c) ? 0 : e->b; + while (e) { + int f = 0; + g(); + if (_setjmp(0)) { + if (f & 6) { + ; + } else if (f & 2) { + h(); + } + } + } + } +} diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 84cdd17..221a07b 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -7039,6 +7039,14 @@ remove_range_assertions (void) FOR_EACH_IMM_USE_ON_STMT (use_p, iter) SET_USE (use_p, var); } + /* But do not propagate constants as that is invalid. */ + else if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (lhs)) + { + gassign *ass = gimple_build_assign (lhs, var); + gsi_replace (&si, ass, true); + gsi_next (&si); + continue; + } else replace_uses_by (lhs, var); |