[gcc(refs/users/guojiufu/heads/personal-branch)] middle-end/95231 - revert parts of PR95171

[Jiu Fu Guo]

https://gcc.gnu.org/g:130bb4c79295487c5fc203103d80e3b754640eb4

commit 130bb4c79295487c5fc203103d80e3b754640eb4
Author: Richard Biener <rguenther@suse.de>
Date:   Wed May 20 11:00:57 2020 +0200

    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.

Diff:
---
 gcc/ChangeLog                        |  6 ++++++
 gcc/testsuite/ChangeLog              |  5 +++++
 gcc/testsuite/g++.dg/other/pr95231.C |  4 ++++
 gcc/tree-inline.c                    | 11 -----------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae0a7477978..2eba6db9a91 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 401025718ee..3d63c57f308 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 00000000000..de063662528
--- /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 943f3f9407b..3160ca3f88a 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);