diff options
| author | Richard Biener <rguenther@suse.de> | 2024-02-23 16:06:05 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2024-02-26 08:42:44 +0100 |
| commit | af66ad89e8169f44db723813662917cf4cbb78fc (patch) | |
| tree | d1b2888efc4021881c1206a9a5d48ea8f64bb1a2 | |
| parent | 6987f16742bd4fc6bb8118b9efde52fb9169b327 (diff) | |
| download | gcc-af66ad89e8169f44db723813662917cf4cbb78fc.zip gcc-af66ad89e8169f44db723813662917cf4cbb78fc.tar.gz gcc-af66ad89e8169f44db723813662917cf4cbb78fc.tar.bz2 | |
middle-end/114070 - folding breaking VEC_COND expansion
The following properly guards the simplifications that move
operations into VEC_CONDs, in particular when that changes the
type constraints on this operation.
This needed a genmatch fix which was recording spurious implicit fors
when tcc_comparison is used in a C expression.
PR middle-end/114070
* genmatch.cc (parser::parse_c_expr): Do not record operand
lists but only mark operators used.
* match.pd ((c ? a : b) op (c ? d : e) --> c ? (a op d) : (b op e)):
Properly guard the case of tcc_comparison changing the VEC_COND
value operand type.
* gcc.dg/torture/pr114070.c: New testcase.
| -rw-r--r-- | gcc/genmatch.cc | 6 | ||||
| -rw-r--r-- | gcc/match.pd | 15 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr114070.c | 12 |
3 files changed, 26 insertions, 7 deletions
diff --git a/gcc/genmatch.cc b/gcc/genmatch.cc index 5e92d0b..61c4c8c 100644 --- a/gcc/genmatch.cc +++ b/gcc/genmatch.cc @@ -4749,10 +4749,8 @@ parser::parse_c_expr (cpp_ttype start) = (const char *)CPP_HASHNODE (token->val.node.node)->ident.str; if (strcmp (str, "return") == 0) fatal_at (token, "return statement not allowed in C expression"); - id_base *idb = get_operator (str); - user_id *p; - if (idb && (p = dyn_cast<user_id *> (idb)) && p->is_oper_list) - record_operlist (token->src_loc, p); + /* Mark user operators corresponding to 'str' as used. */ + get_operator (str); } /* Record the token. */ diff --git a/gcc/match.pd b/gcc/match.pd index c5b6540..67007fc 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -5149,15 +5149,24 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) /* (c ? a : b) op (c ? d : e) --> c ? (a op d) : (b op e) */ (simplify (op (vec_cond:s @0 @1 @2) (vec_cond:s @0 @3 @4)) - (vec_cond @0 (op! @1 @3) (op! @2 @4))) + (if (TREE_CODE_CLASS (op) != tcc_comparison + || types_match (type, TREE_TYPE (@1)) + || expand_vec_cond_expr_p (type, TREE_TYPE (@0), ERROR_MARK)) + (vec_cond @0 (op! @1 @3) (op! @2 @4)))) /* (c ? a : b) op d --> c ? (a op d) : (b op d) */ (simplify (op (vec_cond:s @0 @1 @2) @3) - (vec_cond @0 (op! @1 @3) (op! @2 @3))) + (if (TREE_CODE_CLASS (op) != tcc_comparison + || types_match (type, TREE_TYPE (@1)) + || expand_vec_cond_expr_p (type, TREE_TYPE (@0), ERROR_MARK)) + (vec_cond @0 (op! @1 @3) (op! @2 @3)))) (simplify (op @3 (vec_cond:s @0 @1 @2)) - (vec_cond @0 (op! @3 @1) (op! @3 @2)))) + (if (TREE_CODE_CLASS (op) != tcc_comparison + || types_match (type, TREE_TYPE (@1)) + || expand_vec_cond_expr_p (type, TREE_TYPE (@0), ERROR_MARK)) + (vec_cond @0 (op! @3 @1) (op! @3 @2))))) #if GIMPLE (match (nop_atomic_bit_test_and_p @0 @1 @4) diff --git a/gcc/testsuite/gcc.dg/torture/pr114070.c b/gcc/testsuite/gcc.dg/torture/pr114070.c new file mode 100644 index 0000000..cf46ec4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr114070.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-fno-vect-cost-model" } */ + +int unresolved(unsigned dirmask, unsigned mask, int *unresolved_n) +{ + for (int i = 0; i < 1024; i++) { + mask |= 1; + if (!unresolved_n[i] || unresolved_n[i] & 70000) + dirmask |= 1; + } + return (dirmask == mask); +} |