From patchwork Tue Jul 18 23:12:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 122292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2081409vqt; Tue, 18 Jul 2023 16:42:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlE3T2ITlBAn0uOcyWNnQLMDS1vXTXLx/l11LZSFuoFnFfHL5cl34i5mIRAA8OT/IYJZzMjG X-Received: by 2002:a2e:8509:0:b0:2b6:af60:6342 with SMTP id j9-20020a2e8509000000b002b6af606342mr14695496lji.40.1689723759886; Tue, 18 Jul 2023 16:42:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689723759; cv=none; d=google.com; s=arc-20160816; b=gaujb9qt+bzKzJv/4S9xkMZb0uN9kulqumj4dg71eVGWoTzAFkjn4HlvLbhw9JCaN6 f5JHSLOKJ68JC99GHgYPv0qVFVTRcZ3KG5d9xTRudL8jKk77kbbShLxPAUXaB0ZBV7QT fyfQqoWyLLKTP9/+bTUxCJUdWFGArPcCeftGOf1WXFnnT0TXq2xo89ZbOuZ47RzjYeuI 2ROUpLUsi8WxYop56bFTMLj8LhPmuLKznszY/sXfTRjKs+VfS6seuZeEFRqEXaAapZMy XM7iuCCLB6nzXglZjbui59EjP/AOu5fQxrXml0qK9joVAbWZRnptiZpU5nMMS9wXjoCA tygg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=/bWYG5XLs72glAVDQbSz4MebhtQwbjtiEsu3GBKK/XM=; fh=hKkoBlg2rAphFCrDc208gTEUOqt6AsfxlVHdeTjfSrM=; b=wENnxIVdWPegmk15cHgpyr3DxVkC2OULIaMJuqnBmnPtC0x70mgRQc4CiToZjV/msl IUtnmEEZJ8A1DHvFqtMrCnWPhePaLf32S1/RHB7RZevuNpzrBk12d+Uhuwm5uaQpivEI lXLvjeCrZfMfBAX6VDR1mjvQR4ENU40B5sI59Vl6OFXMGPRZlkpj2VwOUhUNb21O42lT EJrztubA3BBu6+3JMAidbSehsKsOwEzxTdOEdmnY2EP/0G7Wo7zC6suDzxNpMneC026E tvqhOYcjoUe1QRt/hoGV+KGM6PK+uCOhz938qEk+kZhnOfpr2OgZKnxNDsRc+8N2N3Sk E9jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=MPJldYci; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id v9-20020a1709064e8900b0099238b86ef1si2121203eju.164.2023.07.18.16.42.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 16:42:39 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=MPJldYci; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 126A23856090 for ; Tue, 18 Jul 2023 23:42:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 126A23856090 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689723755; bh=/bWYG5XLs72glAVDQbSz4MebhtQwbjtiEsu3GBKK/XM=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=MPJldYciKmmOmoSoXObc5eoH3/EHjACabbneoccNo7XRG0y1oixFeFRIT4njqLB6W CCsxDE4demzHvAWH8s22ibLYpaTuElCAfur/pUzPvQOjMlXaWqXUQL7uktW6UJw7dp BjR3brYys7SchYl1jJalUqjpJuGXph1D8UHr3dgE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00641c01.pphosted.com (mx0b-00641c01.pphosted.com [205.220.177.146]) by sourceware.org (Postfix) with ESMTPS id 0FEF5385AF8B; Tue, 18 Jul 2023 23:41:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0FEF5385AF8B Received: from pps.filterd (m0247477.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36INfZnW026688; Tue, 18 Jul 2023 23:41:50 GMT Received: from mxout25.s.uw.edu (mxout25.s.uw.edu [140.142.234.175]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3rwx0ju7cr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Jul 2023 23:41:50 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout25.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 36INfmOL011147 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 18 Jul 2023 16:41:48 -0700 X-Auth-Received: from localhost.localdomain ([10.154.74.234]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 36INX5M2022682 (version=TLSv1.2 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 18 Jul 2023 16:41:48 -0700 X-UW-Orig-Sender: kmatsui@smtp.washington.edu To: gcc-patches@gcc.gnu.org Cc: Ken Matsui Subject: [PATCH 4/8] c++, tree: Move INDIRECT_TYPE_P to tree.h Date: Tue, 18 Jul 2023 16:12:46 -0700 Message-ID: <20230718233301.28677-5-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230718233301.28677-1-kmatsui@gcc.gnu.org> References: <20230718233301.28677-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: cFEiRnkndBkLXt4CoN9C3ElVPknHt-kg X-Proofpoint-GUID: cFEiRnkndBkLXt4CoN9C3ElVPknHt-kg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-18_17,2023-07-18_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 priorityscore=1501 impostorscore=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 clxscore=1034 mlxscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307180209 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ken Matsui via Gcc-patches From: Ken Matsui Reply-To: Ken Matsui Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771803781139186234 X-GMAIL-MSGID: 1771803781139186234 This patch moves INDIRECT_TYPE_P from cp/cp-tree.h to tree.h to unify POINTER_TYPE_P in tree.h to INDIRECT_TYPE_P, which are equivalent. gcc/cp/ChangeLog: * cp-tree.h (INDIRECT_TYPE_P): Remove. gcc/ChangeLog: * tree.h (INDIRECT_TYPE_P): Define. Signed-off-by: Ken Matsui --- gcc/cp/cp-tree.h | 4 ---- gcc/tree.h | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 681aa95e57f..5236b168ecc 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4706,10 +4706,6 @@ get_vec_init_expr (tree t) #define TYPE_PTRDATAMEM_P(NODE) \ (TREE_CODE (NODE) == OFFSET_TYPE) -/* Returns true if NODE is a pointer or a reference. */ -#define INDIRECT_TYPE_P(NODE) \ - (TYPE_PTR_P (NODE) || TYPE_REF_P (NODE)) - /* Returns true if NODE is an object type: [basic.types] diff --git a/gcc/tree.h b/gcc/tree.h index 48d57764d9c..c369b8470ab 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -686,6 +686,11 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int, #define TYPE_REF_P(NODE) \ (TREE_CODE (NODE) == REFERENCE_TYPE) +/* Nonzero if TYPE represents a pointer or reference type. + Keep these checks in ascending code order. */ +#define INDIRECT_TYPE_P(NODE) \ + (TYPE_PTR_P (NODE) || TYPE_REF_P (NODE)) + /* Nonzero if TYPE represents a pointer or reference type. (It should be renamed to INDIRECT_TYPE_P.) Keep these checks in ascending code order. */