From patchwork Mon May 13 17:21:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 1934767 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=DycmuQdx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdRBq1Nzjz20d6 for ; Tue, 14 May 2024 03:22:43 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 113783842FDA for ; Mon, 13 May 2024 17:22:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 113783842FDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1715620961; bh=Bc4dim8FWmunpO5j0Q7oLLojatFzaJkCl3pHXpt9IPM=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=DycmuQdxvZkfQVrcLy8PZtMs/eCTqW1MPbZW/EntGjJ26zIO/7qCPNTW7gOD8tX8B I5Va8BF0cjFrX4j85+65L+G/Lo83xFTObWFEBNfb7e/MOgUXAjcfvitkznEIpSr+ML EKGwXPtYN1x684Y5I+9GmjoYXiaHL1ktDvClWQJI= 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 9FE4438708EF; Mon, 13 May 2024 17:22:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9FE4438708EF Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9FE4438708EF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.177.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715620930; cv=none; b=h/cnrLZDlrv3wkFvU1kE8bg9jbEIaHbjUgT2+NuXeXugIc9aIc4rOg2y+Qf3YnBSZifS/BjL2e2sbmPcy9LDdSevVJnGkuBWDvfsJK/GUoBw7iiCbNIobbmOncStubMUzbcttBIiEg1s1Q9IIIMI8+4G5NbkttHro74jKa8nzHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715620930; c=relaxed/simple; bh=wYloURWudXtLXQgMJsgZdNurSbUQWCqM6TTaUF03rO4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=eD27ft3pjvB8/S3goatFLMzvd/YQxpE/JJtuEOBBW2E1lU9z/bXY5PxXEMBtZTEEn8VWS6nszJIz2ylH8qsly8shW9lVrJkWbjUqj/LSux7kD2/b6CJGxgWwzY3dcTn0hmAALFNfcZQsctj1ZPW9cuLvpUIZUqFNkXOGPqUonnE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247480.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 44DHHAVE014552; Mon, 13 May 2024 17:22:07 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3y36fww5jg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 May 2024 17:22:07 +0000 (GMT) Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout22.s.uw.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 44DHM2jo017765 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2024 10:22:02 -0700 X-Auth-Received: from ken-20xw00qgus.dhcp4.washington.edu ([10.154.74.147]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW24.02) with ESMTPSA id 44DHM2Gg005017 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 May 2024 10:22:02 -0700 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: Ken Matsui Subject: [COMMITTED] c++: Avoid using __array_rank as a variable name [PR115061] Date: Mon, 13 May 2024 10:21:26 -0700 Message-ID: <20240513172125.942368-2-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Proofpoint-GUID: FM1-XdPuMPwnuxyHMkPfTdF1f3WXO57N X-Proofpoint-ORIG-GUID: FM1-XdPuMPwnuxyHMkPfTdF1f3WXO57N X-outbound-smtp: 1 x-header: uw-relay-non-domains X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-13_12,2024-05-10_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 adultscore=0 clxscore=1034 impostorscore=0 mlxlogscore=744 bulkscore=0 malwarescore=0 spamscore=0 phishscore=0 priorityscore=1501 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2405010000 definitions=main-2405130114 X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Pushed as obvious. -- >8 -- This patch fixes a compilation error when building GCC using Clang. Since __array_rank is used as a built-in trait name, use rank instead. PR c++/115061 gcc/cp/ChangeLog: * semantics.cc (finish_trait_expr): Use rank instead of __array_rank. Signed-off-by: Ken Matsui --- gcc/cp/semantics.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 43b175f92fd..df62e2d80db 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12914,10 +12914,10 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2) tree val; if (kind == CPTK_RANK) { - size_t __array_rank = 0; + size_t rank = 0; for (; TREE_CODE (type1) == ARRAY_TYPE; type1 = TREE_TYPE (type1)) - ++__array_rank; - val = build_int_cst (size_type_node, __array_rank); + ++rank; + val = build_int_cst (size_type_node, rank); } else val = (trait_expr_value (kind, type1, type2)