From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id E996038346B2; Tue, 10 May 2022 08:20:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E996038346B2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10639] ubsan: Fix ICEs with DECL_REGISTER tests [PR101624] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 6cb2b5581d2ca5b4175dc2cf4f32e4251a314eda X-Git-Newrev: 637cdf226ceaf1b96b9304c0626e8dc5e25d7095 Message-Id: <20220510082022.E996038346B2@sourceware.org> Date: Tue, 10 May 2022 08:20:22 +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, 10 May 2022 08:20:23 -0000 https://gcc.gnu.org/g:637cdf226ceaf1b96b9304c0626e8dc5e25d7095 commit r10-10639-g637cdf226ceaf1b96b9304c0626e8dc5e25d7095 Author: Jakub Jelinek Date: Wed Jul 28 18:43:15 2021 +0200 ubsan: Fix ICEs with DECL_REGISTER tests [PR101624] The following testcase ICEs, because the base is a CONST_DECL for the Fortran parameter, and ubsan/sanopt uses DECL_REGISTER macro on it. /* In VAR_DECL and PARM_DECL nodes, nonzero means declared `register'. */ #define DECL_REGISTER(NODE) (DECL_WRTL_CHECK (NODE)->decl_common.decl_flag_0) while CONST_DECL doesn't satisfy DECL_WRTL_CHECK. The following patch checks explicitly for VAR_DECL/PARM_DECL/RESULT_DECL only before using DECL_REGISTER, assumes other decls aren't DECL_REGISTER. Not really sure about RESULT_DECL but it at least satisfies DECL_WRTL_CHECK... 2021-07-28 Jakub Jelinek PR middle-end/101624 * ubsan.c (maybe_instrument_pointer_overflow, instrument_object_size): Only test DECL_REGISTER on VAR_DECLs, PARM_DECLs or RESULT_DECLs. * sanopt.c (maybe_optimize_ubsan_ptr_ifn): Likewise. * gfortran.dg/ubsan/ubsan.exp: New file. * gfortran.dg/ubsan/pr101624.f90: New test. (cherry picked from commit 49e28c02a95a4bee981e69a80950309869580151) Diff: --- gcc/sanopt.c | 5 +++- gcc/testsuite/gfortran.dg/ubsan/pr101624.f90 | 13 ++++++++++ gcc/testsuite/gfortran.dg/ubsan/ubsan.exp | 38 ++++++++++++++++++++++++++++ gcc/ubsan.c | 10 ++++++-- 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/gcc/sanopt.c b/gcc/sanopt.c index 0788eef597e..170da61949c 100644 --- a/gcc/sanopt.c +++ b/gcc/sanopt.c @@ -492,7 +492,10 @@ maybe_optimize_ubsan_ptr_ifn (sanopt_ctx *ctx, gimple *stmt) &unsignedp, &reversep, &volatilep); if ((offset == NULL_TREE || TREE_CODE (offset) == INTEGER_CST) && DECL_P (base) - && !DECL_REGISTER (base) + && ((!VAR_P (base) + && TREE_CODE (base) != PARM_DECL + && TREE_CODE (base) != RESULT_DECL) + || !DECL_REGISTER (base)) && pbitpos.is_constant (&bitpos)) { offset_int expr_offset; diff --git a/gcc/testsuite/gfortran.dg/ubsan/pr101624.f90 b/gcc/testsuite/gfortran.dg/ubsan/pr101624.f90 new file mode 100644 index 00000000000..51783c8ddad --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ubsan/pr101624.f90 @@ -0,0 +1,13 @@ +! PR middle-end/101624 +! { dg-do compile } +! { dg-options "-O2 -fsanitize=undefined" } + +complex function foo (x) + complex, intent(in) :: x + foo = aimag (x) +end +program pr101624 + complex, parameter :: a = (0.0, 1.0) + complex :: b, foo + b = foo (a) +end diff --git a/gcc/testsuite/gfortran.dg/ubsan/ubsan.exp b/gcc/testsuite/gfortran.dg/ubsan/ubsan.exp new file mode 100644 index 00000000000..e44d946c4a0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/ubsan/ubsan.exp @@ -0,0 +1,38 @@ +# Copyright (C) 2021 Free Software Foundation, Inc. +# +# This file is part of GCC. +# +# GCC is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GCC is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +# GCC testsuite for gfortran that checks undefined behavior sanitizer. + +# Load support procs. +load_lib gfortran-dg.exp +load_lib ubsan-dg.exp + + +# Initialize `dg'. +dg-init +ubsan_init + +# Main loop. +if [check_effective_target_fsanitize_undefined] { + gfortran-dg-runtest [lsort \ + [glob -nocomplain $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ] ] "" "" +} + +# All done. +ubsan_finish +dg-finish diff --git a/gcc/ubsan.c b/gcc/ubsan.c index acd8a0b92b9..88d683e60c2 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -1440,7 +1440,10 @@ maybe_instrument_pointer_overflow (gimple_stmt_iterator *gsi, tree t) tree base; if (decl_p) { - if (DECL_REGISTER (inner)) + if ((VAR_P (inner) + || TREE_CODE (inner) == PARM_DECL + || TREE_CODE (inner) == RESULT_DECL) + && DECL_REGISTER (inner)) return; base = inner; /* If BASE is a fixed size automatic variable or @@ -2104,7 +2107,10 @@ instrument_object_size (gimple_stmt_iterator *gsi, tree t, bool is_lhs) tree base; if (decl_p) { - if (DECL_REGISTER (inner)) + if ((VAR_P (inner) + || TREE_CODE (inner) == PARM_DECL + || TREE_CODE (inner) == RESULT_DECL) + && DECL_REGISTER (inner)) return; base = inner; }