From patchwork Thu Feb 15 04:52:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 201246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp171597dyb; Wed, 14 Feb 2024 20:54:16 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWyWAMy3wlC2B+9x+J3mKh/E43dSsXdwP0FBs/MyBgKPDUXjZWJJtj+ZgkIICz0MH9LU4h06QaMwebMV8hRW/2QQ2Eyzg== X-Google-Smtp-Source: AGHT+IHTIu+tSU1zHTc92X/AZEh9E0MgEniAPlfBqo5O9CQjivyFnTlm3fIiI2DYRHSR8LFBBPRZ X-Received: by 2002:a05:6102:d90:b0:46d:38fd:89e3 with SMTP id d16-20020a0561020d9000b0046d38fd89e3mr806848vst.14.1707972856475; Wed, 14 Feb 2024 20:54:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707972856; cv=pass; d=google.com; s=arc-20160816; b=s5OKA2DzgWvw10qUQPjfqwQVxku/ZpeDWpTRo0efot6ldfeTknlOAhi15Cl5xiCZ6c wucb4abGBFhzJ3+v//qG1vq9HwF4mPQt6jeveXr54X0KQ9vQiUs+eN3cs0Q4o/tO7X5Y M53sSxeHMthUZ/JGV+tVpazMS/aQxvtCke/5/Llof29W2NjtDMNEoo4pGrWYq8kT8Gyo 8JsdhrbD4Rl82FTkxX1jVD2mSD9PxSSQTpf4u41DNyWsNDLdns0ulE0/09K7eF7+ZBlU 6y1BKdeh0b4WHO2tcYIyfz/V7huhpFX2aVS50LkuhzuUyG/nwWusOSCeJsSxlsobcFD9 nQDA== 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=GTKTOpbdxQUd54lFPtAoTzBLrBKclYCGjhvbDb59UPk=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=lL4GdKtYhSpjIgfVghKJUp96IEO8eLEzvHBydfVWWYNDvWTTyrU9WOXLa7W1XmkmMs nNQJzov0gZL+1K6jKihpszRHf6z1MQiMSGZwOUkoIVRhgZqzLJvPGCQ8YfYZxULNmvzG 1S0EQwPzYZoh63K/4hUQByjq8bTyE26XC8olA3k6f3B2hKqTZGfBUEYS4BHGXCz8Y2D4 2vz5TiU/ElxWwwjxwWuqrloPEscHHC9M55zcQ1hHxy5PXTvBWKP4LdBTuLdphgYM0lU2 ygJ6fkUsYHoFDCAqy61IiYD8HOnC5cw4rMCgeuNov1d0LT/dvIP08sCiO0L8x0B+xY9+ 5itA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=oKctN4Mo; 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 (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id t5-20020ac865c5000000b0042c7c9646d0si570383qto.78.2024.02.14.20.54.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 20:54:16 -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=oKctN4Mo; 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 261573861835 for ; Thu, 15 Feb 2024 04:54:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 261573861835 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1707972856; bh=GTKTOpbdxQUd54lFPtAoTzBLrBKclYCGjhvbDb59UPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=oKctN4Mo3Rikr7rTvWOgACr/A5jWlld7bXb8pSFSWFLQIWd5LTWVhR1HBYThnulQ/ QYk3g41xK5pARHxIFc+1ZpV8j9k4pWviH1n/BfTrGhsX1EiMbldfNNpsJYrXCpIMXz otIkiTifyKLJAo+dbp8vbHTcbVuwf2MnTLR3OjxE= 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 205463861802; Thu, 15 Feb 2024 04:53:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 205463861802 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 205463861802 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=1707972789; cv=none; b=sQiNtFErgsmHRgqBlL1IdWiHEPWUc2PvV0oBDyJ/KiuVSgk3FsAteuFE4tq1wp8ZMnnaVcmN6qKJBAMzCIre7mPw71IqGVbQ8+5x8WAr2vkujn/8/10olKjXYxt/lL78TFJCmELYTd6WHZJS0Lv99uE+vUxX4yJ0TxiJ5576NRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707972789; c=relaxed/simple; bh=dKDIr5+Bu2onDagYyJ58A3/vAkI3qrotK5wG5bF1Tww=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=l08e2uBeSWe5mkaq4RpuxzhXnStYoTsuEjSLGRZEBc4naKIioIfGsZG6kIap35KX6APXA8emlE4pgzVmAHrDD/L4CToao3nGfnzZHCI9SBeJ0YoZyj7A6pz+0sfLl6RY6mrfuxnfvTvFU5//85MSLSQ9cMwy7Tb3jK2VDQcAeEM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247474.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41F4qMgd028618; Thu, 15 Feb 2024 04:53:06 GMT Received: from mxout26.s.uw.edu (mxout26.s.uw.edu [140.142.234.176]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3w9356cam3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 04:53:06 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout26.s.uw.edu (8.14.4+UW20.07/8.14.4+UW24.02) with ESMTP id 41F4r2c8012173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 14 Feb 2024 20:53:02 -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 41F4r1ej015769 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 14 Feb 2024 20:53:01 -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 v3 1/4] c++: Implement __add_pointer built-in trait Date: Wed, 14 Feb 2024 20:52:55 -0800 Message-ID: <20240215045258.3025806-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214135252.1416047-1-kmatsui@gcc.gnu.org> References: <20240214135252.1416047-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: J1GXSJSh3NWiE7ihNu0-rI__WmIy2ujm X-Proofpoint-ORIG-GUID: J1GXSJSh3NWiE7ihNu0-rI__WmIy2ujm 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-15_04,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 malwarescore=0 adultscore=0 mlxscore=0 mlxlogscore=654 clxscore=1034 spamscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402150033 X-Spam-Status: No, score=-12.8 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: 1790939346169788778 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 | 39 ++++++++++++++++++++++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ 4 files changed, 52 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..8dc975495a8 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 (FUNC_OR_METHOD_TYPE_P (type1) + && (type_memfn_quals (type1) != TYPE_UNQUALIFIED + || type_memfn_rqual (type1) != REF_QUAL_NONE)) + 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..c405cdd0feb --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/add_pointer.C @@ -0,0 +1,39 @@ +// { 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)); + +SA(__is_same(__add_pointer(void() __restrict), void() __restrict)); 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