[gcc r11-9658] middle-end/104402 - split out _Complex compares from COND_EXPRs

[gcc r11-9658] middle-end/104402 - split out _Complex compares from COND_EXPRs

[Richard Biener]

https://gcc.gnu.org/g:cfc310faea6c2ff32b451f8b4842783ecece761c

commit r11-9658-gcfc310faea6c2ff32b451f8b4842783ecece761c
Author: Richard Biener <rguenther@suse.de>
Date:   Mon Feb 7 09:31:07 2022 +0100

    middle-end/104402 - split out _Complex compares from COND_EXPRs
    
    This makes sure we always have a _Complex compare split to a
    different stmt for the compare operand in a COND_EXPR on GIMPLE.
    Complex lowering doesn't handle this and the change is something
    we want for all kind of compares at some point.
    
    2022-02-07  Richard Biener  <rguenther@suse.de>
    
            PR middle-end/104402
            * gimple-expr.c (is_gimple_condexpr): _Complex typed
            compares are not valid.
            * tree-cfg.c (verify_gimple_assign_ternary): For COND_EXPR
            check is_gimple_condexpr.
    
            * gcc.dg/torture/pr104402.c: New testcase.
    
    (cherry picked from commit 70430001b74d0f67386a6b3642c857b3389cd5d0)

Diff:
---
 gcc/gimple-expr.c                       | 20 +++++++++++++-------
 gcc/testsuite/gcc.dg/torture/pr104402.c |  8 ++++++++
 gcc/tree-cfg.c                          |  9 +++++----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/gcc/gimple-expr.c b/gcc/gimple-expr.c
index b8c732b632a..42e5afff194 100644
--- a/gcc/gimple-expr.c
+++ b/gcc/gimple-expr.c
@@ -602,12 +602,16 @@ is_gimple_lvalue (tree t)
 /* Helper for is_gimple_condexpr and is_gimple_condexpr_for_cond.  */
 
 static bool
-is_gimple_condexpr_1 (tree t, bool allow_traps)
+is_gimple_condexpr_1 (tree t, bool allow_traps, bool allow_cplx)
 {
-  return (is_gimple_val (t) || (COMPARISON_CLASS_P (t)
-				&& (allow_traps || !tree_could_throw_p (t))
-				&& is_gimple_val (TREE_OPERAND (t, 0))
-				&& is_gimple_val (TREE_OPERAND (t, 1))));
+  tree op0;
+  return (is_gimple_val (t)
+	  || (COMPARISON_CLASS_P (t)
+	      && (allow_traps || !tree_could_throw_p (t))
+	      && ((op0 = TREE_OPERAND (t, 0)), true)
+	      && (allow_cplx || TREE_CODE (TREE_TYPE (op0)) != COMPLEX_TYPE)
+	      && is_gimple_val (op0)
+	      && is_gimple_val (TREE_OPERAND (t, 1))));
 }
 
 /* Return true if T is a GIMPLE condition.  */
@@ -615,7 +619,9 @@ is_gimple_condexpr_1 (tree t, bool allow_traps)
 bool
 is_gimple_condexpr (tree t)
 {
-  return is_gimple_condexpr_1 (t, true);
+  /* Always split out _Complex type compares since complex lowering
+     doesn't handle this case.  */
+  return is_gimple_condexpr_1 (t, true, false);
 }
 
 /* Like is_gimple_condexpr, but does not allow T to trap.  */
@@ -623,7 +629,7 @@ is_gimple_condexpr (tree t)
 bool
 is_gimple_condexpr_for_cond (tree t)
 {
-  return is_gimple_condexpr_1 (t, false);
+  return is_gimple_condexpr_1 (t, false, true);
 }
 
 /* Return true if T is a gimple address.  */
diff --git a/gcc/testsuite/gcc.dg/torture/pr104402.c b/gcc/testsuite/gcc.dg/torture/pr104402.c
new file mode 100644
index 00000000000..1cb0370e9b2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr104402.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+
+_Complex int a;
+char b;
+void c() {
+  if (b != 2 + (long)(a != 0 ^ 0))
+    __builtin_abort();
+}
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 4f63aa69ba8..f4ec77f1bb0 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -4251,10 +4251,11 @@ verify_gimple_assign_ternary (gassign *stmt)
       /* Fallthrough.  */
     case COND_EXPR:
       if (!is_gimple_val (rhs1)
-	  && verify_gimple_comparison (TREE_TYPE (rhs1),
-				       TREE_OPERAND (rhs1, 0),
-				       TREE_OPERAND (rhs1, 1),
-				       TREE_CODE (rhs1)))
+	  && (!is_gimple_condexpr (rhs1)
+	      || verify_gimple_comparison (TREE_TYPE (rhs1),
+					   TREE_OPERAND (rhs1, 0),
+					   TREE_OPERAND (rhs1, 1),
+					   TREE_CODE (rhs1))))
 	return true;
       if (!useless_type_conversion_p (lhs_type, rhs2_type)
 	  || !useless_type_conversion_p (lhs_type, rhs3_type))