From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 0D4993858035; Tue, 24 Jan 2023 14:27:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0D4993858035 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674570454; bh=GWPD9p7o3NIGL8Y/P4RnOT9E11CsGEvjDq5X/PQoBMg=; h=From:To:Subject:Date:From; b=avgBIwbI2hfsu+4sPvpfI7LXra8OXjxoYEx4iWicE4HQiKYQBQ4ZL5HhES6c3n0rC eX0m7F9kzDHZ51YqEjwbSrjBKSjumeX8x5ZQNGAC75zQt2+VOr9T2MuijWTG18dgla 0U2tnwBHaz1OUNRhBNMHvJlKqkAichsUpnHROcgo= 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-9065] tree-optimization/108164 - undefined overflow with IV vectorization X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: a3dfcaac560f5589028fdd967bfaa60d84c265ac X-Git-Newrev: 50ef4fc8c848929ee79af97ac445a45baab7d575 Message-Id: <20230124142734.0D4993858035@sourceware.org> Date: Tue, 24 Jan 2023 14:27:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:50ef4fc8c848929ee79af97ac445a45baab7d575 commit r12-9065-g50ef4fc8c848929ee79af97ac445a45baab7d575 Author: Richard Biener Date: Mon Dec 19 14:55:45 2022 +0100 tree-optimization/108164 - undefined overflow with IV vectorization vect_update_ivs_after_vectorizer can end up emitting a signed IV update when the loop body performed an unsigned computation. The following makes sure to perform that update in the type of the loop update type to avoid undefined behavior on overflow. PR tree-optimization/108164 * tree-vect-loop-manip.cc (vect_update_ivs_after_vectorizer): Perform vect_step_op_add update in the appropriate type. * gcc.dg/pr108164.c: New testcase. (cherry picked from commit ec459469f8a75d96a9b26694554efcc900d411de) Diff: --- gcc/testsuite/gcc.dg/pr108164.c | 19 +++++++++++++++++++ gcc/tree-vect-loop-manip.cc | 12 +++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.dg/pr108164.c b/gcc/testsuite/gcc.dg/pr108164.c new file mode 100644 index 00000000000..d76d557876e --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr108164.c @@ -0,0 +1,19 @@ +/* { dg-do run } */ +/* { dg-options "-O3 -fno-tree-dce" } */ + +int a, b, c; +int main() +{ + int e = -1; + short f = -1; + for (; c < 1; c++) + while (f >= e) + f++; + for (; a < 2; a++) { + short g = ~(~b | ~f); + int h = -g; + int i = (3 / ~h) / ~b; + b = i; + } + return 0; +} diff --git a/gcc/tree-vect-loop-manip.cc b/gcc/tree-vect-loop-manip.cc index e4381eb7079..cb5bb87ae33 100644 --- a/gcc/tree-vect-loop-manip.cc +++ b/gcc/tree-vect-loop-manip.cc @@ -1596,14 +1596,16 @@ vect_update_ivs_after_vectorizer (loop_vec_info loop_vinfo, init_expr = PHI_ARG_DEF_FROM_EDGE (phi, loop_preheader_edge (loop)); - off = fold_build2 (MULT_EXPR, TREE_TYPE (step_expr), - fold_convert (TREE_TYPE (step_expr), niters), - step_expr); + tree stype = TREE_TYPE (step_expr); + off = fold_build2 (MULT_EXPR, stype, + fold_convert (stype, niters), step_expr); if (POINTER_TYPE_P (type)) ni = fold_build_pointer_plus (init_expr, off); else - ni = fold_build2 (PLUS_EXPR, type, - init_expr, fold_convert (type, off)); + ni = fold_convert (type, + fold_build2 (PLUS_EXPR, stype, + fold_convert (stype, init_expr), + off)); var = create_tmp_var (type, "tmp");