From patchwork Mon Jun 12 22:39:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 106933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp176226vqr; Mon, 12 Jun 2023 15:47:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6IlVCBj8meSSeJq7YA+lVMar/HGfUNWoDvbOKUa1qhe/628QpGasYGnksZclTYSlHdlEd4 X-Received: by 2002:a05:6402:455:b0:510:ddad:fae6 with SMTP id p21-20020a056402045500b00510ddadfae6mr6020638edw.3.1686610053110; Mon, 12 Jun 2023 15:47:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686610053; cv=none; d=google.com; s=arc-20160816; b=vp/t0N42inZuca3EOx7FT8DoPD4TQLdX6t39TJFRXfXiL/4cgmnOgd0k9Dz3+IRZRt wEvCU2A+T0BOMQk75IU0v1l6R/TImPOjcOxfKq3n48Z9flhcTsAtnZvpP/7h4s7St9Xg GMjSdM6YwU/S/Q7aZY2CByjfEknPWYmuGcIakdS4EV+rwcVk15hOwf4Wp93JhyiVLLc3 V+1Pe3obZTdCV7oxGNY4jPubQ8iE6WKVkA7dFOCe4FrCtwz5SjX5PzrGKS0/DWLgTn/n XQhqZ1g2Gb78qGS1ge2lQKPMY4QENBJR9nehrmQF8DRwa1BSyDmSz7um0j7vzLpSk315 UM6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from: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:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=+3DF5/9Kg2IyqmI6/Dg5gg35wDRWMRUVX3bvo5J8lUM=; b=OuKqEfALRJUxOc79LTt5QZsOMO7J9ewWFKLXeEfWMj8UbpkpX/5TwmC6C69UrKc+CU iArrmPK/+dNWcs9/ou9A916QAuUWpJtTU7iDscti4rmpFurhOxMDnxwXWEgNai2wC+oT TPRl8T5FBbtvvbRT8p04njv1gW535+GBHJ3f0FUfV4GBpH9iOtP/Y3tNZGjl0RYXjnrF FJN1sdE9VFREqNL/0UPV0kIVFwxhDKY74e2fEr1oh62l1Q0swU/erqhYwdTQtG8nJtqa kQpMeRyCEdR+i4X9r5FRTrc8OMRBf6vHbEEPcrzRhu6px+15p6hy8gk0KEowZjcPwyju KtbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=tQXR+5hq; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b16-20020aa7c910000000b00514983a993fsi6285316edt.266.2023.06.12.15.47.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 15:47:33 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=tQXR+5hq; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 05A5B38319F0 for ; Mon, 12 Jun 2023 22:45:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 05A5B38319F0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686609936; bh=+3DF5/9Kg2IyqmI6/Dg5gg35wDRWMRUVX3bvo5J8lUM=; 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=tQXR+5hq0Ie4IzPbiekvT/7ZqL3VqWaQ3/axJOVZh1bCqcZwg0+RQWbajnMXw6dvh iQr1aNGcHekPv+eOkPDHYLAOIFLc7wrOQayp0bXGngbadxkHG/9b9UP3AvBJCNF1fL zBhBlqtgdXAlWAZQl91WtuLMyFWbX9KuHZm4aLCs= 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 D0F6A384A871; Mon, 12 Jun 2023 22:44:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0F6A384A871 Received: from pps.filterd (m0247481.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35CMgsZS004500; Mon, 12 Jun 2023 22:44:51 GMT Received: from mxout23.cac.washington.edu (mxout23.cac.washington.edu [140.142.32.140]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3r6aqhgr5t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Jun 2023 22:44:51 +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 35CMibMF015904 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Jun 2023 15:44:37 -0700 X-Auth-Received: from localhost.localdomain ([10.154.74.234]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 35CMfBvT020829 (version=TLSv1.2 cipher=DHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 12 Jun 2023 15:44:37 -0700 X-UW-Orig-Sender: kmatsui@smtp.washington.edu To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Ken Matsui Subject: [PATCH v6 6/6] libstdc++: make std::is_object dispatch to new built-in traits Date: Mon, 12 Jun 2023 15:39:52 -0700 Message-ID: <20230612224109.20749-7-kmatsui@cs.washington.edu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230612224109.20749-1-kmatsui@cs.washington.edu> References: <20230612222515.20102-1-kmatsui@cs.washington.edu> <20230612224109.20749-1-kmatsui@cs.washington.edu> MIME-Version: 1.0 X-Proofpoint-GUID: h1mZP1oZ43GWcArbtscNItNdtTlTpw5G X-Proofpoint-ORIG-GUID: h1mZP1oZ43GWcArbtscNItNdtTlTpw5G X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-12_16,2023-06-12_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 spamscore=0 clxscore=1015 suspectscore=0 phishscore=0 impostorscore=0 mlxscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=885 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306120196 X-Spam-Status: No, score=-14.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, 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.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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761403850642973368?= X-GMAIL-MSGID: =?utf-8?q?1768538822838906898?= This patch gets std::is_object to dispatch to new built-in traits, __is_function, __is_reference, and __is_void. libstdc++-v3/ChangeLog: * include/std/type_traits (is_object): Use new built-in traits, __is_function, __is_reference, and __is_void. (is_object_v): Likewise. Signed-off-by: Ken Matsui --- libstdc++-v3/include/std/type_traits | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 780fcc00135..a20565f75c0 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -682,11 +682,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { }; /// is_object +#if __has_builtin(__is_function) && __has_builtin(__is_reference) \ + && __has_builtin(__is_void) + + template + struct is_object + : public __bool_constant + { }; +#else template struct is_object : public __not_<__or_, is_reference<_Tp>, is_void<_Tp>>>::type { }; +#endif template struct is_member_pointer; @@ -3235,8 +3245,17 @@ template inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value; template inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value; + +#if __has_builtin(__is_function) && __has_builtin(__is_reference) \ + && __has_builtin(__is_void) +template + inline constexpr bool is_object_v + = !(__is_function(_Tp) || __is_reference(_Tp) || __is_void(_Tp)); +#else template inline constexpr bool is_object_v = is_object<_Tp>::value; +#endif + template inline constexpr bool is_scalar_v = is_scalar<_Tp>::value; template