From patchwork Sat Dec 23 23:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 183022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp1899221dyi; Sat, 23 Dec 2023 15:07:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IG3C+rPCVXgg9opZF3yYS/uyrdEtJvJhJI6XR/lhjfiqhN6Bm5kfXBqKrWA1yvCJ2i9ize6 X-Received: by 2002:ad4:5ca1:0:b0:67f:1d52:2b6b with SMTP id q1-20020ad45ca1000000b0067f1d522b6bmr6189476qvh.34.1703372826690; Sat, 23 Dec 2023 15:07:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1703372826; cv=pass; d=google.com; s=arc-20160816; b=w1XGQyq2dpn8a/kpqAm01h69Zw5mVm6kfAWCoSF0vuCkEKo6ujD19UfYF545l1rXj/ PSxDYJa80RQ2ALS92bSWfeOr9DdAHpb1Tw3ZcBYKBDXTQOgDADTJ7649MBRebTvow/2r LKhWvYmwjq+FgJJ1zfPhDwP04Wj2/ibdFsws9qRA4JZgtQgy9rPoJDt1c1PZkpTIdWnJ 26u7cMM0Cwc8p34f1bII7DfqFghKlguDbfxo1JlN5oATNm42FKKWfVpfyt6s4Qft4h7K gH0Qu+E9o9+9ODzPhRgqGNQTlBx2TYcqPigbjQJXWMZVUL4GRd3QNmuc7Tu2Ok03ONbH TgfQ== 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=TFYyXpAfEcFa80UcbNpWz1EiyqFUF5fielkZv0odKto=; fh=gWaPAOlkBn4NfXWp5OzPJhAUieocQfCW2y/drQDuE0I=; b=SjBqLq5VZ1wdf6ops7bm9xekxqOiBdgn/Msn7VwgGR7q4TjdAEGtjmeCFhQ7jzqefD /j9dtdw88oRSAcqXJotIzDL7qYA3o1U399t4JmgSiHFM6c8NW6gpdHDUSsy/C0vg9Ecm C30FwsRYxzRin2jTaMMRylf2DcAIaZAA1RqEwfPR5R8AGMyMiiSE7PLhnCuOyu5Gp8tg PAJ00QXyMBQlKKHj4FJKBDCDJ4FrCyxhzjG675EIainjk5PaZClthSB19F5hbNPjpGxM lTFwG2zTguanWAcj/j60tkxmYAkhuH3wYwiEryfEDZkq7/zAPRxyPQbxyk1vRln8ayAO L68g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jatA+ggS; arc=pass (i=1); 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id q5-20020a0cf5c5000000b0067f9f6ca003si3500311qvm.21.2023.12.23.15.07.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Dec 2023 15:07:06 -0800 (PST) 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=jatA+ggS; arc=pass (i=1); 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 5DBE93858429 for ; Sat, 23 Dec 2023 23:07:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DBE93858429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1703372826; bh=TFYyXpAfEcFa80UcbNpWz1EiyqFUF5fielkZv0odKto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=jatA+ggSFzIZpjoMzMMctgqq/KjpIfW3CxJZpIG/y3rm9H7AxX1sVgb4bIZbX6Nj0 yA2jJ0D6PfjK3WxLTacEcuWqV1hTRwIkCWyL86UYHxloPsZdTgRiTXuBG4JT+6zv57 JxbaFnUIn9VJ6t4fWGzAkKgnUtNUSGGo99TnM2Ck= 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 22D2E3858C98; Sat, 23 Dec 2023 23:06:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22D2E3858C98 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 22D2E3858C98 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=1703372782; cv=none; b=rZ480dRF3HSVL2ZabONDXSGWut0ukDo4a+B9YY72UwTO7M7GTcBmEqin+4HkSbQ1nZ/T1mzRqJkEQLmx/h2sibZcgBS2gHGtlTUxnCK9ky+R7M5Va4p8yDINOeT9AkYfnFRQ2Rzy/kMFzh+dLFIooyep1f169mmIGKkj0tiOCqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703372782; c=relaxed/simple; bh=Q9NlnYyIXxaayHzOWjECKAXttV3fc+803vjjDaVjKpo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=wp39OCUwmcZjzrxTYt6uzUDGBYNkAg9acEymMaCoUxYXFEaIqwXQNj6LylUBm7I3HYfxwekFYHdAZH5F/IbwhlZuy54ddQNyPSbdpE5UEiXadoBTjD6RwMGAQlWUt8bASJGtq0qYHrEQttR1vvPtHDSyTnTpNLXU+vU9rquky+E= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247479.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3BNN023r023066; Sat, 23 Dec 2023 23:06:20 GMT Received: from mxout21.s.uw.edu (mxout21.s.uw.edu [140.142.32.139]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3v5qn13ekj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 Dec 2023 23:06:20 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout21.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 3BNN5xHW027189 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 23 Dec 2023 15:05:59 -0800 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.154.74.194]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 3BNN5xRj012094 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 23 Dec 2023 15:05:59 -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 , Patrick Palka Subject: [PATCH v2] libstdc++: Use _GLIBCXX_USE_BUILTIN_TRAIT Date: Sat, 23 Dec 2023 15:05:58 -0800 Message-ID: <20231223230558.849031-1-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20230911152703.22436-1-kmatsui@gcc.gnu.org> References: <20230911152703.22436-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-GUID: PQhY_Zjckxg48XsZx_bcJyMa58RASxFi X-Proofpoint-ORIG-GUID: PQhY_Zjckxg48XsZx_bcJyMa58RASxFi 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=2023-12-23_11,2023-12-22_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 suspectscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 mlxlogscore=999 impostorscore=0 mlxscore=0 spamscore=0 clxscore=1034 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312230183 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786115865154239560 X-GMAIL-MSGID: 1786115865154239560 This patch uses _GLIBCXX_USE_BUILTIN_TRAIT macro instead of __has_builtin in the type_traits header for traits that have a corresponding fallback non-built-in implementation. This macro supports to toggle the use of built-in traits in the type_traits header through _GLIBCXX_DO_NOT_USE_BUILTIN_TRAITS macro, without needing to modify the source code. libstdc++-v3/ChangeLog: * include/std/type_traits: Use _GLIBCXX_USE_BUILTIN_TRAIT. Signed-off-by: Ken Matsui Reviewed-by: Patrick Palka --- libstdc++-v3/include/std/type_traits | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index f00c07f94f9..ba35ffb27fa 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1481,7 +1481,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : public __bool_constant<__is_base_of(_Base, _Derived)> { }; -#if __has_builtin(__is_convertible) +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_convertible) template struct is_convertible : public __bool_constant<__is_convertible(_From, _To)> @@ -1531,7 +1531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef __cpp_lib_is_nothrow_convertible // C++ >= 20 -#if __has_builtin(__is_nothrow_convertible) +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_nothrow_convertible) /// is_nothrow_convertible_v template inline constexpr bool is_nothrow_convertible_v @@ -1606,7 +1606,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { using type = _Tp; }; /// remove_cv -#if __has_builtin(__remove_cv) +#if _GLIBCXX_USE_BUILTIN_TRAIT(__remove_cv) template struct remove_cv { using type = __remove_cv(_Tp); }; @@ -1672,7 +1672,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Reference transformations. /// remove_reference -#if __has_builtin(__remove_reference) +#if _GLIBCXX_USE_BUILTIN_TRAIT(__remove_reference) template struct remove_reference { using type = __remove_reference(_Tp); }; @@ -3537,7 +3537,7 @@ template * @{ */ #ifdef __cpp_lib_remove_cvref // C++ >= 20 -# if __has_builtin(__remove_cvref) +# if _GLIBCXX_USE_BUILTIN_TRAIT(__remove_cvref) template struct remove_cvref { using type = __remove_cvref(_Tp); };