From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1011) id C4CE03858C50; Fri, 2 Dec 2022 17:01:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4CE03858C50 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670000466; bh=adOBZR2FuNonK9NrYDptCBrNZWzdb9vPoBCC2ySQGYM=; h=From:To:Subject:Date:From; b=BJlV7HcXTqKmSnWKCxLpq4c53q3qiTYJ72c58Bss3pLz8rvWj+8C6skInrDppVQX3 0aFcEmAAYMxqBXDTMVlkmTIimq9Q+G+k+12QMIqiS6yvVa4L8UbOKrRGPi8ZsBglaC Yz+wdM6gViSoO7+FKOzNGRw3xrfHl5z1N/FwTUaQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Macleod To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4468] Fix a few incorrect accesses. X-Act-Checkin: gcc X-Git-Author: Andrew MacLeod X-Git-Refname: refs/heads/master X-Git-Oldrev: 6d3c634c8baebd9ff12c39d61947752486758bd3 X-Git-Newrev: 76dd48f8956b5e17adf0ae1cd1ed3d804a005470 Message-Id: <20221202170106.C4CE03858C50@sourceware.org> Date: Fri, 2 Dec 2022 17:01:06 +0000 (GMT) List-Id: https://gcc.gnu.org/g:76dd48f8956b5e17adf0ae1cd1ed3d804a005470 commit r13-4468-g76dd48f8956b5e17adf0ae1cd1ed3d804a005470 Author: Andrew MacLeod Date: Tue Nov 29 13:07:28 2022 -0500 Fix a few incorrect accesses. This consists of 3 changes which stronger type checking has indicated are incorrect. gcc/ * fold-const.cc (fold_unary_loc): Check TREE_TYPE of node. (tree_invalid_nonnegative_warnv_p): Likewise. gcc/c-family/ * c-attribs.cc (handle_deprecated_attribute): Use type when using TYPE_NAME. Diff: --- gcc/c-family/c-attribs.cc | 2 +- gcc/fold-const.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/c-family/c-attribs.cc b/gcc/c-family/c-attribs.cc index 07bca68e9b9..b36dd97802b 100644 --- a/gcc/c-family/c-attribs.cc +++ b/gcc/c-family/c-attribs.cc @@ -4240,7 +4240,7 @@ handle_deprecated_attribute (tree *node, tree name, if (type && TYPE_NAME (type)) { if (TREE_CODE (TYPE_NAME (type)) == IDENTIFIER_NODE) - what = TYPE_NAME (*node); + what = TYPE_NAME (type); else if (TREE_CODE (TYPE_NAME (type)) == TYPE_DECL && DECL_NAME (TYPE_NAME (type))) what = DECL_NAME (TYPE_NAME (type)); diff --git a/gcc/fold-const.cc b/gcc/fold-const.cc index 114258fa182..e80be8049e1 100644 --- a/gcc/fold-const.cc +++ b/gcc/fold-const.cc @@ -9369,8 +9369,8 @@ fold_unary_loc (location_t loc, enum tree_code code, tree type, tree op0) && TREE_CODE (tem) == COND_EXPR && TREE_CODE (TREE_OPERAND (tem, 1)) == code && TREE_CODE (TREE_OPERAND (tem, 2)) == code - && ! VOID_TYPE_P (TREE_OPERAND (tem, 1)) - && ! VOID_TYPE_P (TREE_OPERAND (tem, 2)) + && ! VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (tem, 1))) + && ! VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (tem, 2))) && (TREE_TYPE (TREE_OPERAND (TREE_OPERAND (tem, 1), 0)) == TREE_TYPE (TREE_OPERAND (TREE_OPERAND (tem, 2), 0))) && (! (INTEGRAL_TYPE_P (TREE_TYPE (tem)) @@ -15002,7 +15002,7 @@ tree_invalid_nonnegative_warnv_p (tree t, bool *strict_overflow_p, int depth) /* If the initializer is non-void, then it's a normal expression that will be assigned to the slot. */ - if (!VOID_TYPE_P (t)) + if (!VOID_TYPE_P (TREE_TYPE (t))) return RECURSE (t); /* Otherwise, the initializer sets the slot in some way. One common