OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ICE in re-simplification of VEC_COND_EXPR 

The function maybe_resimplify_conditional_op uses operation_could_trap_p to
check if the resulting operation of a simplification can trap.  Because of the
changes introduced by revision r276659, this results in an ICE due to a
violated assertion in operation_could_trap_p if the operation is a COND_EXPR or
a VEC_COND_EXPR.  The changes have allowed those expressions to trap and
whether they do cannot be determined without considering their condition
which is not available to operation_could_trap_p.

Change maybe_resimplify_conditional_op to inspect the condition of
COND_EXPRs and VEC_COND_EXPRs to determine if they can trap.

From-SVN: r278853
This commit is contained in:
Frederik Harwath 2019-11-29 15:02:35 +00:00 committed by Frederik Harwath
parent 7e99af4816
commit 6851de8b90
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2019-11-29 Frederik Harwath <frederik@codesourcery.com>
* gimple-match-head.c (maybe_resimplify_conditional_op): Use
generic_expr_could_trap_p to check if the condition of COND_EXPR or
VEC_COND_EXPR can trap.
2019-11-29 Richard Sandiford <richard.sandiford@arm.com>
PR tree-optimization/92677

18
gcc/gimple-match-head.c
View File

@ -144,9 +144,21 @@ maybe_resimplify_conditional_op (gimple_seq *seq, gimple_match_op *res_op,
/* Likewise if the operation would not trap. */
bool honor_trapv = (INTEGRAL_TYPE_P (res_op->type)
&& TYPE_OVERFLOW_TRAPS (res_op->type));
if (!operation_could_trap_p ((tree_code) res_op->code,
FLOAT_TYPE_P (res_op->type),
honor_trapv, res_op->op_or_null (1)))
tree_code op_code = (tree_code) res_op->code;
bool op_could_trap;
/* COND_EXPR and VEC_COND_EXPR will trap if, and only if, the condition
traps and hence we have to check this. For all other operations, we
don't need to consider the operands. */
if (op_code == COND_EXPR || op_code == VEC_COND_EXPR)
op_could_trap = generic_expr_could_trap_p (res_op->ops[0]);
else
op_could_trap = operation_could_trap_p ((tree_code) res_op->code,
FLOAT_TYPE_P (res_op->type),
honor_trapv,
res_op->op_or_null (1));
if (!op_could_trap)
{
res_op->cond.cond = NULL_TREE;
return false;