From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 3CB083858417; Mon, 7 Feb 2022 09:50:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3CB083858417 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7080] middle-end/104402 - split out _Complex compares from COND_EXPRs X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: e66ba0f55c000152df63fc67c11a64f79122ef86 X-Git-Newrev: 70430001b74d0f67386a6b3642c857b3389cd5d0 Message-Id: <20220207095021.3CB083858417@sourceware.org> Date: Mon, 7 Feb 2022 09:50:21 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2022 09:50:21 -0000 https://gcc.gnu.org/g:70430001b74d0f67386a6b3642c857b3389cd5d0 commit r12-7080-g70430001b74d0f67386a6b3642c857b3389cd5d0 Author: Richard Biener 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 PR middle-end/104402 * gimple-expr.cc (is_gimple_condexpr): _Complex typed compares are not valid. * tree-cfg.cc (verify_gimple_assign_ternary): For COND_EXPR check is_gimple_condexpr. * gcc.dg/torture/pr104402.c: New testcase. Diff: --- gcc/gimple-expr.cc | 20 +++++++++++++------- gcc/testsuite/gcc.dg/torture/pr104402.c | 8 ++++++++ gcc/tree-cfg.cc | 9 +++++---- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/gcc/gimple-expr.cc b/gcc/gimple-expr.cc index 05b12747499..f9a650b5daf 100644 --- a/gcc/gimple-expr.cc +++ b/gcc/gimple-expr.cc @@ -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.cc b/gcc/tree-cfg.cc index 260a7fb97c6..e321d929fd0 100644 --- a/gcc/tree-cfg.cc +++ b/gcc/tree-cfg.cc @@ -4289,10 +4289,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))