diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr80842.c | 23 | ||||
| -rw-r--r-- | gcc/tree-ssa-ccp.c | 4 |
4 files changed, 35 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3505ba0..f281611 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2017-05-26 Richard Biener <rguenther@suse.de> + PR tree-optimization/80842 + * tree-ssa-ccp.c (set_lattice_value): Always meet with the old + value. + +2017-05-26 Richard Biener <rguenther@suse.de> + PR tree-optimization/80844 * tree-vectorizer.c (adjust_simduid_builtins): Propagate results. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0adf5cb..6042b19 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-05-26 Richard Biener <rguenther@suse.de> + + PR tree-optimization/80842 + * gcc.dg/torture/pr80842.c: New testcase. + 2017-05-25 Paolo Carlini <paolo.carlini@oracle.com> PR c++/79652 diff --git a/gcc/testsuite/gcc.dg/torture/pr80842.c b/gcc/testsuite/gcc.dg/torture/pr80842.c new file mode 100644 index 0000000..600e8ce --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr80842.c @@ -0,0 +1,23 @@ +/* { dg-do compile } */ + +unsigned a; +short b; +char c, d, e; +void fn1(); +void fn2() { + a++; + for (; a;) + fn1(0, 0); +} +void fn3() { + fn2(); +l1:; + unsigned char f; + short g; + unsigned char *h = &f; + g += &h ? e ? g = 1 : 0 : 0; + d = g; + c *f; + if (d & (b %= *h) < f * d / (d -= 0)) + goto l1; +} diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index b54062c..f18f2e0 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -497,9 +497,7 @@ set_lattice_value (tree var, ccp_prop_value_t *new_val) use the meet operator to retain a conservative value. Missed optimizations like PR65851 makes this necessary. It also ensures we converge to a stable lattice solution. */ - if (new_val->lattice_val == CONSTANT - && old_val->lattice_val == CONSTANT - && TREE_CODE (new_val->value) != SSA_NAME) + if (old_val->lattice_val != UNINITIALIZED) ccp_lattice_meet (new_val, old_val); gcc_checking_assert (valid_lattice_transition (*old_val, *new_val)); |