diff options
| author | Richard Biener <rguenther@suse.de> | 2020-05-20 11:00:57 +0200 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2020-05-20 13:27:46 +0200 |
| commit | 130bb4c79295487c5fc203103d80e3b754640eb4 (patch) | |
| tree | 4eb2d27ac4a541c12f84fa0e2cfd7892e96ce33d /gcc | |
| parent | 35b980365c9230c1d704e561e1d4a8e0e69d2a82 (diff) | |
| download | gcc-130bb4c79295487c5fc203103d80e3b754640eb4.zip gcc-130bb4c79295487c5fc203103d80e3b754640eb4.tar.gz gcc-130bb4c79295487c5fc203103d80e3b754640eb4.tar.bz2 | |
middle-end/95231 - revert parts of PR95171
I mistook the opportunity to also "fix" the [VEC_]COND_EXPR case
for PR95171 but I was wrong in that it doesn't need the fix and
in the actual fix as well. The following just reverts that part.
2020-05-20 Richard Biener <rguenther@suse.de>
PR middle-end/95231
* tree-inline.c (remap_gimple_stmt): Revert adjusting
COND_EXPR and VEC_COND_EXPR for a -fnon-call-exception boundary.
* g++.dg/other/pr95231.C: New testcase.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/other/pr95231.C | 4 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 11 |
4 files changed, 15 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae0a747..2eba6db 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-05-20 Richard Biener <rguenther@suse.de> + + PR middle-end/95231 + * tree-inline.c (remap_gimple_stmt): Revert adjusting + COND_EXPR and VEC_COND_EXPR for a -fnon-call-exception boundary. + 2020-05-20 Srinath Parvathaneni <srinath.parvathaneni@arm.com> Andre Vieira <andre.simoesdiasvieira@arm.com> diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4010257..3d63c57 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-05-20 Richard Biener <rguenther@suse.de> + + PR middle-end/95231 + * g++.dg/other/pr95231.C: New testcase. + 2020-05-30 Richard Biener <rguenther@suse.de> PR c/95141 diff --git a/gcc/testsuite/g++.dg/other/pr95231.C b/gcc/testsuite/g++.dg/other/pr95231.C new file mode 100644 index 0000000..de06366 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr95231.C @@ -0,0 +1,4 @@ +/* { dg-do compile { target c++11 } } */ +/* { dg-options "-O3 -fnon-call-exceptions" } */ + +#include "vector-compare.C" diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 943f3f9..3160ca3 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1974,17 +1974,6 @@ remap_gimple_stmt (gimple *stmt, copy_body_data *id) gimple_cond_set_lhs (cond, gimple_assign_lhs (cmp)); gimple_cond_set_rhs (cond, boolean_false_node); } - if (gassign *ass = dyn_cast <gassign *> (copy)) - if ((gimple_assign_rhs_code (ass) == COND_EXPR - || gimple_assign_rhs_code (ass) == VEC_COND_EXPR) - && gimple_could_trap_p (ass)) - { - gassign *cmp - = gimple_build_assign (make_ssa_name (boolean_type_node), - gimple_assign_rhs1 (ass)); - gimple_seq_add_stmt (&stmts, cmp); - gimple_assign_set_rhs1 (ass, gimple_assign_lhs (cmp)); - } } gimple_seq_add_stmt (&stmts, copy); |