From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id F30DE385C326; Mon, 20 Jun 2022 13:02:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F30DE385C326 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 r13-1174] middle-end/106027 - fix types in needle folding X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: 86882d9feb6a534325d7162216696266898e36d0 X-Git-Newrev: 713f2fd923442b1be620a44240ddf786ae0ab476 Message-Id: <20220620130219.F30DE385C326@sourceware.org> Date: Mon, 20 Jun 2022 13:02:19 +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, 20 Jun 2022 13:02:20 -0000 https://gcc.gnu.org/g:713f2fd923442b1be620a44240ddf786ae0ab476 commit r13-1174-g713f2fd923442b1be620a44240ddf786ae0ab476 Author: Richard Biener Date: Mon Jun 20 13:40:50 2022 +0200 middle-end/106027 - fix types in needle folding The fold_to_nonsharp_ineq_using_bound folding ends up creating invalid typed IL which confuses later foldings. The following fixes that. 2022-06-20 Richard Biener PR middle-end/106027 * fold-const.cc (fold_to_nonsharp_ineq_using_bound): Use the type of the prevailing comparison for the new comparison type. (fold_binary_loc): Use proper types for the A < X && A + 1 > Y to A < X && A >= Y folding. * gcc.dg/pr106027.c: New testcase. Diff: --- gcc/fold-const.cc | 10 +++++++--- gcc/testsuite/gcc.dg/pr106027.c | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc index fbdf3c824af..99021a82df4 100644 --- a/gcc/fold-const.cc +++ b/gcc/fold-const.cc @@ -7530,7 +7530,7 @@ tree_swap_operands_p (const_tree arg0, const_tree arg1) static tree fold_to_nonsharp_ineq_using_bound (location_t loc, tree ineq, tree bound) { - tree a, typea, type = TREE_TYPE (ineq), a1, diff, y; + tree a, typea, type = TREE_TYPE (bound), a1, diff, y; if (TREE_CODE (bound) == LT_EXPR) a = TREE_OPERAND (bound, 0); @@ -12037,11 +12037,15 @@ fold_binary_loc (location_t loc, enum tree_code code, tree type, { tem = fold_to_nonsharp_ineq_using_bound (loc, arg0, arg1); if (tem && !operand_equal_p (tem, arg0, 0)) - return fold_build2_loc (loc, code, type, tem, arg1); + return fold_convert (type, + fold_build2_loc (loc, code, TREE_TYPE (arg1), + tem, arg1)); tem = fold_to_nonsharp_ineq_using_bound (loc, arg1, arg0); if (tem && !operand_equal_p (tem, arg1, 0)) - return fold_build2_loc (loc, code, type, arg0, tem); + return fold_convert (type, + fold_build2_loc (loc, code, TREE_TYPE (arg0), + arg0, tem)); } if ((tem = fold_truth_andor (loc, code, type, arg0, arg1, op0, op1)) diff --git a/gcc/testsuite/gcc.dg/pr106027.c b/gcc/testsuite/gcc.dg/pr106027.c new file mode 100644 index 00000000000..735205fb252 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr106027.c @@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-options "-O" } */ + +int +foo (unsigned int x, int y) +{ + return x <= (((y != y) < 0) ? y < 1 : 0); +}