From patchwork Wed Feb 14 13:52:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 200960 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp1225539dyb; Wed, 14 Feb 2024 05:54:49 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV6ACYfY6P9M3BY4UpDbItrRXV6FfQXY46MhV7oogHEMTSaZ4x+Pgxplyk2MX+Ma5RAkMD7zNWRMF1a4wAEEMa2iQg4UA== X-Google-Smtp-Source: AGHT+IFXU7XjEo2dUsYBihQd+z8B6xYRolYIdJneiO0z0g73Xe6K1hrfd2t1YUuRHbs9fHZ0xm3Z X-Received: by 2002:ac8:7e90:0:b0:42d:a70d:6df3 with SMTP id w16-20020ac87e90000000b0042da70d6df3mr2927786qtj.32.1707918889712; Wed, 14 Feb 2024 05:54:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707918889; cv=pass; d=google.com; s=arc-20160816; b=zShg2hmu7B8nOlicl1K35Ztjk4AYGLgCbraQVJy2b0g2p9DRhuXD+jKEqvUoSBKGr4 PCgeXk7KrLRPgTDyKirDLQO2sH3OLjpCOflkc8nJDymHM0Li6rwwFK2zmu39jwVAEeMC xTTxDHbJd0rmEvhG3Zwl5Ylp+Upy1tvEXihVfAq1ghkd6+dImpYmqhiajqCD0ujRP50X qYaQZhwzy9uiG8GSGORtqQZu8c9Zoi3E23cYT1qRwnNbzRCRiBhU274E64hlBvhvN2cm kje2SDOBJE0h41mE/KeL81TSkUbk3JTpnMfoXW0HJf2ehJXs4TPNZN3SaGfDwQ2E0GOt A7EA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to: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 :from:arc-filter:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=lnilSjNkyNw+P75u1spnEUULrgCxyRX7LpCiyrJytKY=; fh=+HLQln3thmqyLc3QQoMn/xcrZ3EqldtpPzAg34V43Eo=; b=d9/WlJRuUYVrXIZV8EtMZPjWs+XsCexgeGC9gTrR4zyTET/li0T0qNmaxJkzYIBJmz XvkVJDl0UiVkVNIKfMz9pDJ38AsQqGry+cZfpqHp/D6n8ozj40zgV5u0QhWBLX1zrEcG ygB0rp9NNgh/MK/8hcHkZKy/XqgMDz/h9td+RQAxu5R4l1sBO7ZqMcSQGMI7/DlXUng8 OIQFzbX5qyygwHCX6SFFt8uCiMHqnqCR7hbNBzjopyv1PQQERnkUO0Q+iI1wMuSu1q44 Mmanz1CFl9VWVlqUgsSf/FNGzCm9fSFLiB5qQ3rdY17QxGZCobbpUBhGEqVeXrrp4fuA AM4A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="Mt1l/V93"; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 X-Forwarded-Encrypted: i=2; AJvYcCWxJX4PP7CKVdwxgxLofhqZrV5OO7bf3dDFeJXPgFcP3Y678O9mGG6le5l/WJFrLSrFNlnyJWxKuEoFIxCGCKj1lCE+vA== Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id d19-20020a05620a167300b00785d7f24cb9si6771179qko.640.2024.02.14.05.54.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 05:54:49 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="Mt1l/V93"; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 5B076385E02A for ; Wed, 14 Feb 2024 13:54:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B076385E02A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1707918889; bh=lnilSjNkyNw+P75u1spnEUULrgCxyRX7LpCiyrJytKY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Mt1l/V93E5nPPTQWdJpsTvpoA+5DDoQ9ZuxMe99eRqLzUohw4NNk2mYze5UdGM7a2 UMYahOsm1gJdj9xd8Fjg8fLYER9PWutx3kA7jx43kxAQ3HXjSjCwlkKjWgLKoQMdzk eTn0Y/1iTu0s0H4IKI3tEkyiBIPGfnxda9ubnuIs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id C2479385DC27; Wed, 14 Feb 2024 13:53:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C2479385DC27 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 C2479385DC27 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707918802; cv=none; b=lpen1Ry9r2DBipIrcARi9z9djzUE/J22SNaqQkT181vi6JS2vYXdRTGQSaYqHHDkpGWuwRLl5GngzejCjzh6FFSGXjYKe7hvO6vlrjFBQHNa5Gi36I5y0xsfv0TUF2CfysgTi5E/xR1kvdJbimTFrYWtK8atEm7eZwz+19pDLNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707918802; c=relaxed/simple; bh=TC36lHwh3uKtei4oLZoVcS9hpnutBz1xIUTByxldaiE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=uyxoPozwRKEPMNSerb+M/WKxY+wJIjQlto8JeBEPEO++cDVJMSyGNscW0AcJOo8YuoPnJJMM5r5CTC5yAS51HLILsocaIYLTQyOnf9ywUy1mgYbuuZJGAl9WJpThtNMmbFULu8ptAgGwHAz3MJmRljltjDV6zgH08UNR4rlUEkU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247472.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41EDp3e1006574; Wed, 14 Feb 2024 13:53:19 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3w8kqqtr04-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Feb 2024 13:53:19 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.132]) by mxout22.s.uw.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41EDqxOK026427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Feb 2024 05:52:59 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.143]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW24.02) with ESMTPSA id 41EDqxIn024820 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Feb 2024 05:52:59 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu From: Ken Matsui To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v2 1/4] c++: Implement __add_pointer built-in trait Date: Wed, 14 Feb 2024 05:52:49 -0800 Message-ID: <20240214135252.1416047-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214114448.847646-1-kmatsui@gcc.gnu.org> References: <20240214114448.847646-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: dWFaPCeh8eq9wHd1GnZtfnCmhJd2AyP5 X-Proofpoint-GUID: dWFaPCeh8eq9wHd1GnZtfnCmhJd2AyP5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-14_06,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 mlxscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=663 suspectscore=0 clxscore=1034 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402140107 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790874693629428413 X-GMAIL-MSGID: 1790882757597508349 This patch implements built-in trait for std::add_pointer. gcc/cp/ChangeLog: * cp-trait.def: Define __add_pointer. * semantics.cc (finish_trait_type): Handle CPTK_ADD_POINTER. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __add_pointer. * g++.dg/ext/add_pointer.C: New test. Signed-off-by: Ken Matsui --- gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 9 ++++++ gcc/testsuite/g++.dg/ext/add_pointer.C | 37 ++++++++++++++++++++++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ 4 files changed, 50 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/add_pointer.C diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index 394f006f20f..cec385ee501 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -48,6 +48,7 @@ #define DEFTRAIT_TYPE_DEFAULTED #endif +DEFTRAIT_TYPE (ADD_POINTER, "__add_pointer", 1) DEFTRAIT_EXPR (HAS_NOTHROW_ASSIGN, "__has_nothrow_assign", 1) DEFTRAIT_EXPR (HAS_NOTHROW_CONSTRUCTOR, "__has_nothrow_constructor", 1) DEFTRAIT_EXPR (HAS_NOTHROW_COPY, "__has_nothrow_copy", 1) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 57840176863..e23693ab57f 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12760,6 +12760,15 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2, switch (kind) { + case CPTK_ADD_POINTER: + if (TREE_CODE (type1) == FUNCTION_TYPE + && ((TYPE_QUALS (type1) & (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE)) + || FUNCTION_REF_QUALIFIED (type1))) + return type1; + if (TYPE_REF_P (type1)) + type1 = TREE_TYPE (type1); + return build_pointer_type (type1); + case CPTK_REMOVE_CV: return cv_unqualified (type1); diff --git a/gcc/testsuite/g++.dg/ext/add_pointer.C b/gcc/testsuite/g++.dg/ext/add_pointer.C new file mode 100644 index 00000000000..3091510f3b5 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/add_pointer.C @@ -0,0 +1,37 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +class ClassType { }; + +SA(__is_same(__add_pointer(int), int*)); +SA(__is_same(__add_pointer(int*), int**)); +SA(__is_same(__add_pointer(const int), const int*)); +SA(__is_same(__add_pointer(int&), int*)); +SA(__is_same(__add_pointer(ClassType*), ClassType**)); +SA(__is_same(__add_pointer(ClassType), ClassType*)); +SA(__is_same(__add_pointer(void), void*)); +SA(__is_same(__add_pointer(const void), const void*)); +SA(__is_same(__add_pointer(volatile void), volatile void*)); +SA(__is_same(__add_pointer(const volatile void), const volatile void*)); + +void f1(); +using f1_type = decltype(f1); +using pf1_type = decltype(&f1); +SA(__is_same(__add_pointer(f1_type), pf1_type)); + +void f2() noexcept; // PR libstdc++/78361 +using f2_type = decltype(f2); +using pf2_type = decltype(&f2); +SA(__is_same(__add_pointer(f2_type), pf2_type)); + +using fn_type = void(); +using pfn_type = void(*)(); +SA(__is_same(__add_pointer(fn_type), pfn_type)); + +SA(__is_same(__add_pointer(void() &), void() &)); +SA(__is_same(__add_pointer(void() & noexcept), void() & noexcept)); +SA(__is_same(__add_pointer(void() const), void() const)); +SA(__is_same(__add_pointer(void(...) &), void(...) &)); +SA(__is_same(__add_pointer(void(...) & noexcept), void(...) & noexcept)); +SA(__is_same(__add_pointer(void(...) const), void(...) const)); diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index 02b4b4d745d..56e8db7ac32 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -2,6 +2,9 @@ // { dg-do compile } // Verify that __has_builtin gives the correct answer for C++ built-ins. +#if !__has_builtin (__add_pointer) +# error "__has_builtin (__add_pointer) failed" +#endif #if !__has_builtin (__builtin_addressof) # error "__has_builtin (__builtin_addressof) failed" #endif