From patchwork Wed Jan 10 09:22:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 83780 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 2D1D038582BD for ; Wed, 10 Jan 2024 19:46:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D1D038582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704915983; bh=A/cV/jkwOMqGB4fNKmrTPoKGnGSMBBL7ZWi1AtiQ57k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=BP5ua1phAPlVWyCkELpVt0tqu29K+Uz2wxeqL52PU96U/GtHHnzrFw4rVpdic28ZZ RINOUnPl8rse6VZNS1RpN+sz4+4XCyxcucCzvo6SOy9U4Al6oYxJk2DoJfGsEvxS12 5FR7Eocej275Gc9PkxSYvU3Q4oefNEp/1xQPSgeg= 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 0DB8338582AC; Wed, 10 Jan 2024 19:41:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0DB8338582AC 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 0DB8338582AC 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=1704915668; cv=none; b=Jx167cfVweXE4jB/3i0ZWmW2KyEqdRTZaJPPHXZd8+c9L9qpl7N2+2CGMmGfJvb3sBplCceTrBYoQRfr0c4aCcWP/nbdU6i1S/ReQ/DxJkDgA49tCA0a2PInXhmTpL7dJHRXgOTAhOENMe890Gf9bTB6FAr58jRZSMYk2SIxCtk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704915668; c=relaxed/simple; bh=n8QWfpU7eDwDINzPotv0c20d1GpCtyHnE+y+aKFv9+o=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=CQQvMG6mKHt4MMe7Cus84Pfclxl4P79sCyuXfaHNRscd0bxGVvgRMJU6xPymrQvLlnm5hrQZXDIuPLCQbbQvt40F+4YxVzOtqNxGkzuDPaIvtrntFdnCZ4UDDg7foLr2PBWRdkrk+Qs+c6p8MKSOO2HL6R/8gpu1MH33Osc7Igs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247478.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40AJdV6l025110; Wed, 10 Jan 2024 19:41:04 GMT Received: from mxout23.cac.washington.edu (mxout23.cac.washington.edu [140.142.32.140]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3vj0g38ptg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Jan 2024 19:41:04 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout23.cac.washington.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 40AJegFw027798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 10 Jan 2024 11:40:42 -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+UW19.10) with ESMTPSA id 40AJefnA020412 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Jan 2024 11:40:42 -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 01/14] c++: Implement __is_integral built-in trait Date: Wed, 10 Jan 2024 01:22:52 -0800 Message-ID: <20240110194031.2384005-2-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240110194031.2384005-1-kmatsui@gcc.gnu.org> References: <20240110194031.2384005-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: B0d_q3T3L9I6feR_P9YGlA6CfHW7GY38 X-Proofpoint-GUID: B0d_q3T3L9I6feR_P9YGlA6CfHW7GY38 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-10_10,2024-01-10_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 impostorscore=0 malwarescore=0 spamscore=0 clxscore=1034 priorityscore=1501 adultscore=0 mlxscore=0 lowpriorityscore=0 bulkscore=0 mlxlogscore=768 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401100156 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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+patchwork=sourceware.org@gcc.gnu.org This patch implements built-in trait for std::is_integral. gcc/cp/ChangeLog: * cp-trait.def: Define __is_integral. * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_INTEGRAL. * semantics.cc (trait_expr_value): Likewise. (finish_trait_expr): Likewise. (integral_type_p): New function. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __is_integral. * g++.dg/ext/is_integral.C: New test. Signed-off-by: Ken Matsui --- gcc/cp/constraint.cc | 3 ++ gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 18 +++++++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ gcc/testsuite/g++.dg/ext/is_integral.C | 49 ++++++++++++++++++++++++ 5 files changed, 74 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/is_integral.C diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index fef68cf7ab2..3a105a2ee2a 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -3755,6 +3755,9 @@ diagnose_trait_expr (tree expr, tree args) case CPTK_IS_FUNCTION: inform (loc, " %qT is not a function", t1); break; + case CPTK_IS_INTEGRAL: + inform (loc, " %qT is not an integral type", t1); + break; case CPTK_IS_LAYOUT_COMPATIBLE: inform (loc, " %qT is not layout compatible with %qT", t1, t2); break; diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index 394f006f20f..2773c3fa10e 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -70,6 +70,7 @@ DEFTRAIT_EXPR (IS_EMPTY, "__is_empty", 1) DEFTRAIT_EXPR (IS_ENUM, "__is_enum", 1) DEFTRAIT_EXPR (IS_FINAL, "__is_final", 1) DEFTRAIT_EXPR (IS_FUNCTION, "__is_function", 1) +DEFTRAIT_EXPR (IS_INTEGRAL, "__is_integral", 1) DEFTRAIT_EXPR (IS_LAYOUT_COMPATIBLE, "__is_layout_compatible", 2) DEFTRAIT_EXPR (IS_LITERAL_TYPE, "__is_literal_type", 1) DEFTRAIT_EXPR (IS_MEMBER_FUNCTION_POINTER, "__is_member_function_pointer", 1) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 3299e270446..1a335f69826 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12258,6 +12258,20 @@ is_corresponding_member_aggr (location_t loc, tree basetype1, tree membertype1, return ret; } +/* Return true if T is an integral type. With __STRICT_ANSI__, __int128 and + unsigned __int128 are not integral types. */ + +static bool +integral_type_p (const_tree t) +{ + if (flag_iso) + return CP_INTEGRAL_TYPE_P (t) + && t != intTI_type_node + && t != unsigned_intTI_type_node; + else + return CP_INTEGRAL_TYPE_P (t); +} + /* Fold __builtin_is_corresponding_member call. */ tree @@ -12465,6 +12479,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_FUNCTION: return type_code1 == FUNCTION_TYPE; + case CPTK_IS_INTEGRAL: + return integral_type_p (type1); + case CPTK_IS_LAYOUT_COMPATIBLE: return layout_compatible_type_p (type1, type2); @@ -12691,6 +12708,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_CLASS: case CPTK_IS_ENUM: case CPTK_IS_FUNCTION: + case CPTK_IS_INTEGRAL: case CPTK_IS_MEMBER_FUNCTION_POINTER: case CPTK_IS_MEMBER_OBJECT_POINTER: case CPTK_IS_MEMBER_POINTER: diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index 02b4b4d745d..d621171481c 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -89,6 +89,9 @@ #if !__has_builtin (__is_function) # error "__has_builtin (__is_function) failed" #endif +#if !__has_builtin (__is_integral) +# error "__has_builtin (__is_integral) failed" +#endif #if !__has_builtin (__is_layout_compatible) # error "__has_builtin (__is_layout_compatible) failed" #endif diff --git a/gcc/testsuite/g++.dg/ext/is_integral.C b/gcc/testsuite/g++.dg/ext/is_integral.C new file mode 100644 index 00000000000..d2c732133dd --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/is_integral.C @@ -0,0 +1,49 @@ +// { dg-do compile { target c++11 } } + +#define SA(X) static_assert((X),#X) + +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ + SA(TRAIT(TYPE) == EXPECT); \ + SA(TRAIT(const TYPE) == EXPECT); \ + SA(TRAIT(volatile TYPE) == EXPECT); \ + SA(TRAIT(const volatile TYPE) == EXPECT) + +SA_TEST_CATEGORY(__is_integral, void, false); + +SA_TEST_CATEGORY(__is_integral, char, true); +SA_TEST_CATEGORY(__is_integral, signed char, true); +SA_TEST_CATEGORY(__is_integral, unsigned char, true); +SA_TEST_CATEGORY(__is_integral, wchar_t, true); +#ifdef _GLIBCXX_USE_CHAR8_T +SA_TEST_CATEGORY(__is_integral, char8_t, true); +#endif +SA_TEST_CATEGORY(__is_integral, char16_t, true); +SA_TEST_CATEGORY(__is_integral, char32_t, true); +SA_TEST_CATEGORY(__is_integral, short, true); +SA_TEST_CATEGORY(__is_integral, unsigned short, true); +SA_TEST_CATEGORY(__is_integral, int, true); +SA_TEST_CATEGORY(__is_integral, unsigned int, true); +SA_TEST_CATEGORY(__is_integral, long, true); +SA_TEST_CATEGORY(__is_integral, unsigned long, true); +SA_TEST_CATEGORY(__is_integral, long long, true); +SA_TEST_CATEGORY(__is_integral, unsigned long long, true); + +SA_TEST_CATEGORY(__is_integral, float, false); +SA_TEST_CATEGORY(__is_integral, double, false); +SA_TEST_CATEGORY(__is_integral, long double, false); + +#ifndef __STRICT_ANSI__ +// GNU Extensions. +#ifdef __SIZEOF_INT128__ +SA_TEST_CATEGORY(__is_integral, __int128, true); +SA_TEST_CATEGORY(__is_integral, unsigned __int128, true); +#endif + +#ifdef _GLIBCXX_USE_FLOAT128 +SA_TEST_CATEGORY(__is_integral, __float128, false); +#endif +#endif + +// Sanity check. +class ClassType { }; +SA_TEST_CATEGORY(__is_integral, ClassType, false);