diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr87117-2.c | 15 | ||||
| -rw-r--r-- | gcc/tree-ssa-pre.c | 3 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b8c25ba..dd3ca99 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,14 @@ 2018-08-28 Richard Biener <rguenther@suse.de> PR tree-optimization/87117 + * tree-ssa-pre.c (compute_avail): Do not make expressions + with predicated values available. + (get_expr_value_id): Assert we do not run into predicated value + expressions. + +2018-08-28 Richard Biener <rguenther@suse.de> + + PR tree-optimization/87117 * tree-ssa-operands.c (add_stmt_operand): STRING_CST may get virtual operands. (get_expr_operands): Handle STRING_CST like other decls. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ddd365e..aa6f770 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2018-08-28 Richard Biener <rguenther@suse.de> PR tree-optimization/87117 + * gcc.dg/pr87117-2.c: New testcase. + +2018-08-28 Richard Biener <rguenther@suse.de> + + PR tree-optimization/87117 * gcc.dg/lvalue-5.c: New testcase. 2018-08-27 Jeff Law <law@redhat.com> diff --git a/gcc/testsuite/gcc.dg/pr87117-2.c b/gcc/testsuite/gcc.dg/pr87117-2.c new file mode 100644 index 0000000..aefa813 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr87117-2.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fcode-hoisting" } */ + +void e(); + +void a(int c, char **d) +{ + char b; + if (1 < c) + b = (char)(__INTPTR_TYPE__)d[0]; + if (1 < c && b) + e(); + while (1 < c) + ; +} diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 2dce88b..267086c 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -663,6 +663,7 @@ get_expr_value_id (pre_expr expr) id = VN_INFO (PRE_EXPR_NAME (expr))->value_id; break; case NARY: + gcc_assert (!PRE_EXPR_NARY (expr)->predicated_values); id = PRE_EXPR_NARY (expr)->value_id; break; case REFERENCE: @@ -3902,7 +3903,7 @@ compute_avail (void) continue; vn_nary_op_lookup_stmt (stmt, &nary); - if (!nary) + if (!nary || nary->predicated_values) continue; /* If the NARY traps and there was a preceding |