diff options
| author | Richard Biener <rguenther@suse.de> | 2021-04-14 10:53:30 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2021-04-23 13:05:45 +0200 |
| commit | 35b2be219fc1934ae040d045e355680a83d839c4 (patch) | |
| tree | fc0d9490569f66db1b5ff3668c7671b772529e7e /gcc/genmatch.c | |
| parent | 58ad6b2802592f1448eed48e8ad4e0e87985cecb (diff) | |
| download | gcc-35b2be219fc1934ae040d045e355680a83d839c4.zip gcc-35b2be219fc1934ae040d045e355680a83d839c4.tar.gz gcc-35b2be219fc1934ae040d045e355680a83d839c4.tar.bz2 | |
VEC_COND_EXPR code cleanup
This removes now unnecessary special-casings of VEC_COND_EXPRs after
making its first operand a gimple value.
2021-04-14 Richard Biener <rguenther@suse.de>
* genmatch.c (lower_cond): Remove VEC_COND_EXPR special-casing.
(capture_info::capture_info): Likewise.
(capture_info::walk_match): Likewise.
(expr::gen_transform): Likewise.
(dt_simplify::gen_1): Likewise.
* gimple-match-head.c (maybe_resimplify_conditional_op):
Remove VEC_COND_EXPR special-casing.
(gimple_simplify): Likewise.
* gimple.c (gimple_could_trap_p_1): Adjust.
* tree-ssa-pre.c (compute_avail): Allow VEC_COND_EXPR
to participate in PRE.
Diffstat (limited to 'gcc/genmatch.c')
| -rw-r--r-- | gcc/genmatch.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gcc/genmatch.c b/gcc/genmatch.c index 8311f5d..5db1d96 100644 --- a/gcc/genmatch.c +++ b/gcc/genmatch.c @@ -1210,7 +1210,7 @@ lower_opt (simplify *s, vec<simplify *>& simplifiers) } } -/* Lower the compare operand of COND_EXPRs and VEC_COND_EXPRs to a +/* Lower the compare operand of COND_EXPRs to a GENERIC and a GIMPLE variant. */ static vec<operand *> @@ -1257,8 +1257,7 @@ lower_cond (operand *o) /* If this is a COND with a captured expression or an expression with two operands then also match a GENERIC form on the compare. */ - if ((*e->operation == COND_EXPR - || *e->operation == VEC_COND_EXPR) + if (*e->operation == COND_EXPR && ((is_a <capture *> (e->ops[0]) && as_a <capture *> (e->ops[0])->what && is_a <expr *> (as_a <capture *> (e->ops[0])->what) @@ -1296,7 +1295,7 @@ lower_cond (operand *o) return ro; } -/* Lower the compare operand of COND_EXPRs and VEC_COND_EXPRs to a +/* Lower the compare operand of COND_EXPRs to a GENERIC and a GIMPLE variant. */ static void @@ -2132,9 +2131,7 @@ capture_info::capture_info (simplify *s, operand *result, bool gimple_) (i != 0 && *e->operation == COND_EXPR) || *e->operation == TRUTH_ANDIF_EXPR || *e->operation == TRUTH_ORIF_EXPR, - i == 0 - && (*e->operation == COND_EXPR - || *e->operation == VEC_COND_EXPR)); + i == 0 && *e->operation == COND_EXPR); walk_result (s->result, false, result); } @@ -2197,8 +2194,7 @@ capture_info::walk_match (operand *o, unsigned toplevel_arg, || *e->operation == TRUTH_ORIF_EXPR) cond_p = true; if (i == 0 - && (*e->operation == COND_EXPR - || *e->operation == VEC_COND_EXPR)) + && *e->operation == COND_EXPR) expr_cond_p = true; walk_match (e->ops[i], toplevel_arg, cond_p, expr_cond_p); } @@ -2494,8 +2490,7 @@ expr::gen_transform (FILE *f, int indent, const char *dest, bool gimple, i == 0 ? NULL : op0type); ops[i]->gen_transform (f, indent, dest1, gimple, depth + 1, optype1, cinfo, indexes, - (*opr == COND_EXPR - || *opr == VEC_COND_EXPR) && i == 0 ? 1 : 2); + *opr == COND_EXPR && i == 0 ? 1 : 2); } const char *opr_name; @@ -3417,8 +3412,7 @@ dt_simplify::gen_1 (FILE *f, int indent, bool gimple, operand *result) into COND_EXPRs. */ int cond_handling = 0; if (!is_predicate) - cond_handling = ((*opr == COND_EXPR - || *opr == VEC_COND_EXPR) && j == 0) ? 1 : 2; + cond_handling = (*opr == COND_EXPR && j == 0) ? 1 : 2; e->ops[j]->gen_transform (f, indent, dest, true, 1, optype, &cinfo, indexes, cond_handling); } |