From patchwork Wed Jan 10 09:22:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 83781 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 B5B603858431 for ; Wed, 10 Jan 2024 19:47:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B5B603858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1704916060; bh=RMjqgS2RJYGA47zCCDoXZ2LdUIiTsZm/kh0uoeERwnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=X5NYM91jW5A/GbNmGu128VbpxzKxvZqj7WgvWcAi8dOT8pjNyDByE6Hwo7QL2MqIG XZBdMdAuhuXx2fxD0yDmPbJ7yAoNXiBfrzfvtUA5/UQOveASiXR1ZrysVDJSPOhfBP HPapHrmqDJw9fpvHC0qBXh7Kxp5vWoWMejOL8628= 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 7A6653858006; Wed, 10 Jan 2024 19:41:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7A6653858006 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 7A6653858006 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=1704915681; cv=none; b=GkkocOvY5n2vP+1ZpM2qE+54gm/2qr7VjpMnxBdHuZ/Dqmr5havAJ1zGFNwW3Yh9jhABFOtJs/WoHv5sgfz4gV6kZQCJzWbO6NAWIBqzAjyJLOMgIwYCMy51g7hSnAIX5mwnYoAq611AqcMB7IqQFxiq30h0OUfBQQzo+C57yvg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704915681; c=relaxed/simple; bh=nBJqnkJ4N2ZM+zlwVn7F029QCgKGqpfD3hg2x/MC0L4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=xJU7hGsHHEu0cdZi72QHnR+erMH4Eifda2jC27Qo4eulmz1OErAXOE2W74/wcw1dQyEzWItvPipyDeQkHNQABGM3DB5qpMqRUl4LUSnmumwLZ9utkUxJmMKAHPDRQzRMQPOhqj42xMSZvOetfMueSSegLJdZmG6hAEX1pTNvMsE= ARC-Authentication-Results: i=1; server2.sourceware.org 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 40AJbSDq011353; Wed, 10 Jan 2024 19:41:10 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3vhyq0sc4b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Jan 2024 19:41:10 +0000 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+UW22.04) with ESMTP id 40AJegQd006372 (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 40AJefnC020412 (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 03/14] c++: Implement __is_floating_point built-in trait Date: Wed, 10 Jan 2024 01:22:54 -0800 Message-ID: <20240110194031.2384005-4-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: aBcs1nPUJYyG482W_1hj9KCH5VC30fQj X-Proofpoint-GUID: aBcs1nPUJYyG482W_1hj9KCH5VC30fQj 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 adultscore=0 lowpriorityscore=0 clxscore=1034 impostorscore=0 malwarescore=0 spamscore=0 bulkscore=0 phishscore=0 mlxscore=0 mlxlogscore=803 suspectscore=0 priorityscore=1501 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_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+patchwork=sourceware.org@gcc.gnu.org This patch implements built-in trait for std::is_floating_point. gcc/cp/ChangeLog: * cp-trait.def: Define __is_floating_point. * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_FLOATING_POINT. * semantics.cc (trait_expr_value): Likewise. (finish_trait_expr): Likewise. (floating_point_type_p): New function. gcc/testsuite/ChangeLog: * g++.dg/ext/has-builtin-1.C: Test existence of __is_floating_point. * g++.dg/ext/is_floating_point.C: New test. Signed-off-by: Ken Matsui --- gcc/cp/constraint.cc | 3 ++ gcc/cp/cp-trait.def | 1 + gcc/cp/semantics.cc | 17 ++++++++ gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++ gcc/testsuite/g++.dg/ext/is_floating_point.C | 43 ++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 gcc/testsuite/g++.dg/ext/is_floating_point.C diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index 3a105a2ee2a..aca0b91711f 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -3752,6 +3752,9 @@ diagnose_trait_expr (tree expr, tree args) case CPTK_IS_FINAL: inform (loc, " %qT is not a final class", t1); break; + case CPTK_IS_FLOATING_POINT: + inform (loc, " %qT is not a floating point type", t1); + break; case CPTK_IS_FUNCTION: inform (loc, " %qT is not a function", t1); break; diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def index 2773c3fa10e..acf668d48ee 100644 --- a/gcc/cp/cp-trait.def +++ b/gcc/cp/cp-trait.def @@ -69,6 +69,7 @@ DEFTRAIT_EXPR (IS_CONVERTIBLE, "__is_convertible", 2) DEFTRAIT_EXPR (IS_EMPTY, "__is_empty", 1) DEFTRAIT_EXPR (IS_ENUM, "__is_enum", 1) DEFTRAIT_EXPR (IS_FINAL, "__is_final", 1) +DEFTRAIT_EXPR (IS_FLOATING_POINT, "__is_floating_point", 1) DEFTRAIT_EXPR (IS_FUNCTION, "__is_function", 1) DEFTRAIT_EXPR (IS_INTEGRAL, "__is_integral", 1) DEFTRAIT_EXPR (IS_LAYOUT_COMPATIBLE, "__is_layout_compatible", 2) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 1a335f69826..c052e47c204 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -12272,6 +12272,19 @@ integral_type_p (const_tree t) return CP_INTEGRAL_TYPE_P (t); } +/* Return true if T is a floating point type. With __STRICT_ANSI__, __float128 + is not a floating point type. However, _Float128 is a floating point type. + */ + +static bool +floating_point_type_p (const_tree t) +{ + if (flag_iso) + return SCALAR_FLOAT_TYPE_P (t) && t != float128t_type_node; + else + return SCALAR_FLOAT_TYPE_P (t); +} + /* Fold __builtin_is_corresponding_member call. */ tree @@ -12476,6 +12489,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_FINAL: return CLASS_TYPE_P (type1) && CLASSTYPE_FINAL (type1); + case CPTK_IS_FLOATING_POINT: + return floating_point_type_p (type1); + case CPTK_IS_FUNCTION: return type_code1 == FUNCTION_TYPE; @@ -12707,6 +12723,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2) case CPTK_IS_BOUNDED_ARRAY: case CPTK_IS_CLASS: case CPTK_IS_ENUM: + case CPTK_IS_FLOATING_POINT: case CPTK_IS_FUNCTION: case CPTK_IS_INTEGRAL: case CPTK_IS_MEMBER_FUNCTION_POINTER: diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C index d621171481c..5dc70a19e79 100644 --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C @@ -86,6 +86,9 @@ #if !__has_builtin (__is_final) # error "__has_builtin (__is_final) failed" #endif +#if !__has_builtin (__is_floating_point) +# error "__has_builtin (__is_floating_point) failed" +#endif #if !__has_builtin (__is_function) # error "__has_builtin (__is_function) failed" #endif diff --git a/gcc/testsuite/g++.dg/ext/is_floating_point.C b/gcc/testsuite/g++.dg/ext/is_floating_point.C new file mode 100644 index 00000000000..1807279dfc2 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/is_floating_point.C @@ -0,0 +1,43 @@ +// { 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_floating_point, void, false); +SA_TEST_CATEGORY(__is_floating_point, char, false); +SA_TEST_CATEGORY(__is_floating_point, signed char, false); +SA_TEST_CATEGORY(__is_floating_point, unsigned char, false); +SA_TEST_CATEGORY(__is_floating_point, wchar_t, false); +SA_TEST_CATEGORY(__is_floating_point, short, false); +SA_TEST_CATEGORY(__is_floating_point, unsigned short, false); +SA_TEST_CATEGORY(__is_floating_point, int, false); +SA_TEST_CATEGORY(__is_floating_point, unsigned int, false); +SA_TEST_CATEGORY(__is_floating_point, long, false); +SA_TEST_CATEGORY(__is_floating_point, unsigned long, false); +SA_TEST_CATEGORY(__is_floating_point, long long, false); +SA_TEST_CATEGORY(__is_floating_point, unsigned long long, false); + +SA_TEST_CATEGORY(__is_floating_point, float, true); +SA_TEST_CATEGORY(__is_floating_point, double, true); +SA_TEST_CATEGORY(__is_floating_point, long double, true); + +#ifndef __STRICT_ANSI__ +// GNU Extensions. +#ifdef _GLIBCXX_USE_FLOAT128 +SA_TEST_CATEGORY(__is_floating_point, __float128, true); +#endif + +#ifdef __SIZEOF_INT128__ +SA_TEST_CATEGORY(__is_floating_point, __int128, false); +SA_TEST_CATEGORY(__is_floating_point, unsigned __int128, false); +#endif +#endif + +// Sanity check. +class ClassType { }; +SA_TEST_CATEGORY(__is_floating_point, ClassType, false);