diff options
| author | Richard Sandiford <richard.sandiford@arm.com> | 2021-04-27 18:30:36 +0100 |
|---|---|---|
| committer | Richard Sandiford <richard.sandiford@arm.com> | 2021-04-27 18:30:36 +0100 |
| commit | d0a57b030f1c7df33c6bc3c661d16c9cb79e96dd (patch) | |
| tree | f795bc6ca70c9a3e42e8ec329abb66a32579b101 | |
| parent | 2ae2a45c287d254c2890feff2cca46ed2ddb06ca (diff) | |
| download | gcc-d0a57b030f1c7df33c6bc3c661d16c9cb79e96dd.zip gcc-d0a57b030f1c7df33c6bc3c661d16c9cb79e96dd.tar.gz gcc-d0a57b030f1c7df33c6bc3c661d16c9cb79e96dd.tar.bz2 | |
Fix handling of VEC_COND_EXPR trap tests [PR100284]
Now that VEC_COND_EXPR has normal unnested operands,
operation_could_trap_p can treat it like any other expression.
This fixes many testsuite ICEs for SVE, but it turns out that none
of the tests in gcc.target/aarch64/sve were affected. Anyone testing
on non-SVE aarch64 therefore wouldn't have seen it.
gcc/
PR middle-end/100284
* gimple.c (gimple_could_trap_p_1): Remove VEC_COND_EXPR test.
* tree-eh.c (operation_could_trap_p): Handle VEC_COND_EXPR rather
than asserting on it.
gcc/testsuite/
PR middle-end/100284
* gcc.target/aarch64/sve/pr81003.c: New test.
| -rw-r--r-- | gcc/gimple.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/aarch64/sve/pr81003.c | 10 | ||||
| -rw-r--r-- | gcc/tree-eh.c | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/gcc/gimple.c b/gcc/gimple.c index d067656..f1044e9 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -2161,9 +2161,6 @@ gimple_could_trap_p_1 (gimple *s, bool include_mem, bool include_stores) /* For COND_EXPR only the condition may trap. */ if (op == COND_EXPR) return tree_could_trap_p (gimple_assign_rhs1 (s)); - /* A VEC_COND_EXPR cannot trap. */ - else if (op == VEC_COND_EXPR) - return false; /* For comparisons we need to check rhs operand types instead of rhs type (which is BOOLEAN_TYPE). */ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr81003.c b/gcc/testsuite/gcc.target/aarch64/sve/pr81003.c new file mode 100644 index 0000000..661a6f9 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/sve/pr81003.c @@ -0,0 +1,10 @@ +/* { dg-options "-O3" } */ + +unsigned int a, b; + +void +foo (void) +{ + for (b = 0; b < 13; b += 2) + a &= !!b; +} diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index a68778b..601285c 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -2541,9 +2541,9 @@ operation_could_trap_p (enum tree_code op, bool fp_operation, bool honor_trapv, bool honor_snans = fp_operation && flag_signaling_nans != 0; bool handled; - /* This function cannot tell whether or not COND_EXPR and VEC_COND_EXPR could - trap, because that depends on the respective condition op. */ - gcc_assert (op != COND_EXPR && op != VEC_COND_EXPR); + /* This function cannot tell whether or not COND_EXPR could trap, + because that depends on its condition op. */ + gcc_assert (op != COND_EXPR); if (TREE_CODE_CLASS (op) != tcc_comparison && TREE_CODE_CLASS (op) != tcc_unary |