From patchwork Tue Mar 21 11:10:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 66676 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 17B5F3857C43 for ; Tue, 21 Mar 2023 11:12:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 17B5F3857C43 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679397166; bh=c64wdTp7Jd0sQgfRLIBr+e03gnoarw1QmH6JxZHUMfI=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=TIA/Lt5fWMb8PZmVLd7RnBLXizalshfS3V5L1YbteEb3DtoLiq1zuKlJ0W2TgiwC4 aawAomeLqSVUEX7FajOybSi+GaG9rIC+F7RrM8U+kepUtcEJygym7zDCi8vuVYy4oy VTv7BBLQmEZKWFfjWXPTqw/RrNyv3+bGGtQGwGGg= 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 245EA3858D38; Tue, 21 Mar 2023 11:11:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 245EA3858D38 Received: from pps.filterd (m0247470.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32LAqL7Q014178; Tue, 21 Mar 2023 11:11:20 GMT Received: from mxout26.s.uw.edu (mxout26.s.uw.edu [140.142.234.176]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3pevw8mdj1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 11:11:19 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout26.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 32LBB2Wg016957 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Mar 2023 04:11:02 -0700 X-Auth-Received: from localhost.localdomain ([10.154.74.245]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 32LBB2ch005196 (version=TLSv1.2 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 21 Mar 2023 04:11:02 -0700 X-UW-Orig-Sender: kmatsui@smtp.washington.edu To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, ppalka@redhat.com, Ken Matsui Subject: [PATCH 1/2] c++: implement __add_const built-in trait Date: Tue, 21 Mar 2023 04:10:55 -0700 Message-Id: <20230321111056.78121-1-kmatsui@cs.washington.edu> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Proofpoint-GUID: wAn-m-DxUwW9ep_4OJxHnYkcZ9vFpssJ X-Proofpoint-ORIG-GUID: wAn-m-DxUwW9ep_4OJxHnYkcZ9vFpssJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-21_08,2023-03-21_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 adultscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 phishscore=0 mlxlogscore=705 spamscore=0 clxscore=1015 impostorscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303210086 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, 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.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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This patch implements built-in trait for std::add_const. gcc/cp/ChangeLog: * cp-trait.def: Define __add_const. * semantics.cc (finish_trait_type): Handle CPTK_ADD_CONST. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __add_const. * g++.dg/ext/add_const.C: New test. --- gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 6 ++++ gcc/testsuite/g++.dg/ext/add_const.C | 39 ++++++++++++++++++++++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ 4 files changed, 49 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/add_const.C diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index bac593c0094..e362c448c84 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -91,6 +91,7 @@ DEFTRAIT_TYPE (REMOVE_CV, "__remove_cv", 1) DEFTRAIT_TYPE (REMOVE_REFERENCE, "__remove_reference", 1) DEFTRAIT_TYPE (REMOVE_CVREF, "__remove_cvref", 1) DEFTRAIT_TYPE (UNDERLYING_TYPE, "__underlying_type", 1) +DEFTRAIT_TYPE (ADD_CONST, "__add_const", 1) /* These traits yield a type pack, not a type, and are represented by cp_parser_trait as a special BASES tree instead of a TRAIT_TYPE tree. */ diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 87c2e8a7111..14e27a71a55 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12273,6 +12273,12 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2) if (TYPE_REF_P (type1)) type1 = TREE_TYPE (type1); return cv_unqualified (type1); + case CPTK_ADD_CONST: + if (TYPE_REF_P (type1) || TYPE_PTRFN_P (type1)) + return type1; + return cp_build_qualified_type (type1, + cp_type_quals (type1) | + TYPE_QUAL_CONST); #define DEFTRAIT_EXPR(CODE, NAME, ARITY) \ case CPTK_##CODE: diff --git a/gcc/testsuite/g++.dg/ext/add_const.C b/gcc/testsuite/g++.dg/ext/add_const.C new file mode 100644 index 00000000000..1c8618a8b00 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/add_const.C @@ -0,0 +1,39 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +SA(__is_same(__add_const(void), const void)); +SA(__is_same(__add_const(int), const int)); + +SA(__is_same(__add_const(const int), const int)); +SA(__is_same(__add_const(volatile int), const volatile int)); +SA(__is_same(__add_const(const volatile int), const volatile int)); + +SA(__is_same(__add_const(int*), int* const)); +SA(__is_same(__add_const(int* const), int* const)); +SA(__is_same(__add_const(int* volatile), int* const volatile)); +SA(__is_same(__add_const(int* const volatile), int* const volatile)); + +SA(__is_same(__add_const(const int*), const int* const)); +SA(__is_same(__add_const(volatile int*), volatile int* const)); +SA(__is_same(__add_const(const volatile int*), const volatile int* const)); + +SA(__is_same(__add_const(int&), int&)); +SA(__is_same(__add_const(const int&), const int&)); +SA(__is_same(__add_const(volatile int&), volatile int&)); +SA(__is_same(__add_const(const volatile int&), const volatile int&)); + +SA(__is_same(__add_const(int&&), int&&)); +SA(__is_same(__add_const(const int&&), const int&&)); +SA(__is_same(__add_const(volatile int&&), volatile int&&)); +SA(__is_same(__add_const(const volatile int&&), const volatile int&&)); + +SA(__is_same(__add_const(int[3]), const int[3])); +SA(__is_same(__add_const(const int[3]), const int[3])); +SA(__is_same(__add_const(volatile int[3]), const volatile int[3])); +SA(__is_same(__add_const(const volatile int[3]), const volatile int[3])); + +SA(__is_same(__add_const(int(int)), int(int))); +SA(__is_same(__add_const(int(*const)(int)), int(*const)(int))); +SA(__is_same(__add_const(int(*volatile)(int)), int(*volatile)(int))); +SA(__is_same(__add_const(int(*const volatile)(int)), int(*const volatile)(int))); diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index f343e153e56..dd331ebbc9a 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -146,3 +146,6 @@ #if !__has_builtin (__remove_cvref) # error "__has_builtin (__remove_cvref) failed" #endif +#if !__has_builtin (__add_const) +# error "__has_builtin (__add_const) failed" +#endif From patchwork Tue Mar 21 11:10:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 66675 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9295A385084C for ; Tue, 21 Mar 2023 11:11:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9295A385084C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679397108; bh=0N4XSuw4JG1boQUaMMb4OrG6A7HTAHuqL4EqGOySO+4=; 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=H4upJggaEFz3gG6L9q2J1IdAj/V+ujYjRBXbTqWFbQzjGOkK8LdQ95uTHjUZ1GMUG TM3KqQKyET6YADO24i2u1B9bWRraZfqL2nSMxxiFp2mW9h2upUVyM4PWk61c+Dkq4E i+sMWSm4q9gjRiQBx5xc0PtDhn0DG697OsWXANiY= 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 43F383858D37; Tue, 21 Mar 2023 11:11:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 43F383858D37 Received: from pps.filterd (m0247476.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32LB6D5I017011; Tue, 21 Mar 2023 11:11: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 3peuwvmxcv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 21 Mar 2023 11:11:19 +0000 Received: from smtp.washington.edu (smtp.washington.edu [140.142.234.157]) by mxout22.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 32LBBE2m023411 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 21 Mar 2023 04:11:14 -0700 X-Auth-Received: from localhost.localdomain ([10.154.74.245]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 32LBB2ci005196 (version=TLSv1.2 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 21 Mar 2023 04:11:14 -0700 X-UW-Orig-Sender: kmatsui@smtp.washington.edu To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, ppalka@redhat.com, Ken Matsui Subject: [PATCH 2/2] libstdc++: use new built-in trait __add_const Date: Tue, 21 Mar 2023 04:10:56 -0700 Message-Id: <20230321111056.78121-2-kmatsui@cs.washington.edu> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230321111056.78121-1-kmatsui@cs.washington.edu> References: <20230321111056.78121-1-kmatsui@cs.washington.edu> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: FhIgn7atXTvVUBnx8sjZlynPYsC_q7X- X-Proofpoint-GUID: FhIgn7atXTvVUBnx8sjZlynPYsC_q7X- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-21_08,2023-03-21_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 phishscore=0 impostorscore=0 mlxscore=0 suspectscore=0 priorityscore=1501 mlxlogscore=986 spamscore=0 malwarescore=0 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303210086 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, 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.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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" This patch lets libstdc++ use new built-in trait __add_const. libstdc++-v3/ChangeLog: * include/std/type_traits (add_const): Use __add_const built-in trait. --- libstdc++-v3/include/std/type_traits | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 2bd607a8b8f..1ac75a928c3 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1560,9 +1560,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif /// add_const +#if __has_builtin(__add_const) + template + struct add_const + { using type = __add_const(_Tp); }; +#else template struct add_const { using type = _Tp const; }; +#endif /// add_volatile template