From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 57A5A3857029; Tue, 8 Mar 2022 08:56:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 57A5A3857029 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-7531] tree-optimization/104825 - guard modref query X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: b1a741a03041782b34effcb820fbe19ba41a3b8f X-Git-Newrev: dc46350d44c2949ec38deb028960f8040f8e8e5d Message-Id: <20220308085608.57A5A3857029@sourceware.org> Date: Tue, 8 Mar 2022 08:56:08 +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: Tue, 08 Mar 2022 08:56:08 -0000 https://gcc.gnu.org/g:dc46350d44c2949ec38deb028960f8040f8e8e5d commit r12-7531-gdc46350d44c2949ec38deb028960f8040f8e8e5d Author: Richard Biener Date: Tue Mar 8 08:42:58 2022 +0100 tree-optimization/104825 - guard modref query The following makes sure to guard the modref query in VN on a pointer typed argument. 2022-03-08 Richard Biener PR tree-optimization/104825 * tree-ssa-sccvn.cc (visit_reference_op_call): Properly guard modref get_ao_ref on a pointer typed argument. * gcc.dg/torture/pr104825.c: New testcase. Diff: --- gcc/testsuite/gcc.dg/torture/pr104825.c | 14 ++++++++++++++ gcc/tree-ssa-sccvn.cc | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gcc.dg/torture/pr104825.c b/gcc/testsuite/gcc.dg/torture/pr104825.c new file mode 100644 index 00000000000..7affacc2094 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr104825.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-additional-options "-Wno-stringop-overread" } */ + +int foo (fmt) +char* fmt; +{ + return (__builtin_strchr (fmt, '*') != 0 + || __builtin_strchr (fmt, 'n') != 0); +} +void bar () +{ + if (foo (1)) + __builtin_abort (); +} diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index d4d0aba880c..66b4fc21f5b 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -5140,11 +5140,12 @@ visit_reference_op_call (tree lhs, gcall *stmt) { accesses.quick_grow (accesses.length () + 1); ao_ref *r = &accesses.last (); - if (!access_node.get_ao_ref (stmt, r)) + tree arg = access_node.get_call_arg (stmt); + if (!POINTER_TYPE_P (TREE_TYPE (arg)) + || !access_node.get_ao_ref (stmt, r)) { /* Initialize a ref based on the argument and unknown offset if possible. */ - tree arg = access_node.get_call_arg (stmt); if (arg && TREE_CODE (arg) == SSA_NAME) arg = SSA_VAL (arg); if (arg