From patchwork Tue Oct 24 02:01:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken Matsui X-Patchwork-Id: 157212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp1670118vqx; Mon, 23 Oct 2023 19:13:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwppPW00mmoSE8vPf/QVqJtbvGIFEoWX1UziehpTApAElZs1rJKaRUPKakw0ujGZQFCJzT X-Received: by 2002:a05:620a:1790:b0:773:c4c8:2d58 with SMTP id ay16-20020a05620a179000b00773c4c82d58mr11553823qkb.59.1698113583124; Mon, 23 Oct 2023 19:13:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1698113583; cv=pass; d=google.com; s=arc-20160816; b=mu71W/+b9nBHl9WA1qWJ6swO9S74aDK/Uka51xJSZ2QRU9IZ9bbM6EJt6MtNa5QmpH FovNuL03M2dxqEZLfKgf/mieRCmbn2eT670bFNlVzxced8/JhJpZacTstdmyiR6+tmME m0UKca9G8/41aPINTYKKcJZYR7gHEqoEKkSxC+sp5TJMXa3EvvwP2/wUjdSTak94co3D LNfgMmzNwGZ0gg7EY97QnzJz7wt/u0lQWh3TzptKW99nAcgNW1m43vKh4nwnPkCEqBIH SZPN+nJdW++iu+3BwQR6s9n3UrVRqRsC4yUlq96KGYs9HD4dXd1tijRKzfI4/QfaJjZg iNTQ== 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=cG8i9qpk7NIhDSiGi+uGgITBTv1/ygSQT0CzI1N+5v8=; fh=kSSy/oyUXqQD15FLeKdymIgDBFPFITPA1Gj52CNOxRQ=; b=nnx7MyhoC1qRw5lLytWYQW80gdghsltNiPt15mRwPsr9mINE5ZWKw0kO0ncvtisSwT EYwMHwOxLHE9G1trzjK9Uj0wBxbRoCSSuJlh1AoucWfomsXddO5HaZzOTqLRhg9Q7AJx o5td5B7l7hyr8oQoOEG82vyXuLxOAgUsweYD3939Izoe+fQIQUFvbKfDTvaJZVvOOvgf gkME72etMhaTJx6xk+pWAaHgR279Qa2nazmCy/8t35Trhd0YIp35odg+ApVOCWl6v2yh fjzNjisK4T5DU1bwKM8hePug0RSaat5arzzS0ZbpkC8VfEeIfwb5YBCsbjiW8ncKULjb z7WA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=f8cCXPO2; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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. [8.43.85.97]) by mx.google.com with ESMTPS id e15-20020a05620a014f00b0077583599c4esi5969719qkn.239.2023.10.23.19.13.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 19:13:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=f8cCXPO2; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 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 7E7BA38323CC for ; Tue, 24 Oct 2023 02:12:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E7BA38323CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1698113563; bh=cG8i9qpk7NIhDSiGi+uGgITBTv1/ygSQT0CzI1N+5v8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=f8cCXPO2FSvtWotIBAEviLbargZWn0jduhJllTxxW1/GKc6ZPMEfZ4BBkEM2UcU2f YJr+CfP32bwk5Ic/KSE29ijUqI8Qn4iXX/+ABGhZ2w5uwrhzwBdlOMCRohS9PurJbW ERSuqopkg3vnhT8naV7/Bn0fS3vYF0ZJDs4Gvctg= 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 586493857C45; Tue, 24 Oct 2023 02:05:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 586493857C45 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 586493857C45 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=1698113103; cv=none; b=Zcih5awsG/srMyFWDJjTcP+n+/Ve+oc3H3Z1hla0j2I+nLqUqHDoQomqn1z4CYjSPCwKLdZLZtzwP7ptDsN1c3cdRt6SvXJl8O69Pl/fClI+gula4Wi/fJhhNq94Q8TO4zRI2sAmFUsYNuPZjwXvLnON0hV2URLyBfbjU+7Dxx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698113103; c=relaxed/simple; bh=qBsdz13WlQlTwoUGT2laq7f/WQAbB6feMEtdIIicZ3E=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=xFkRAvnxwpLcCu99Wpes8oPTAJG7KgWU4gZyBBz16G93cbsClIden8x0Z0rDcA/aByKoOYy9qqYK1zOVJENk9WyF/Xni6vRfnrJQZG6H+QoFzAfHUQiCDSi7GNf+HNK/3JckBbY6OKBX1Hf2hEOArORUpMk2YxZoTEJdsFbP9n8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247471.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 39O1waxn012214; Tue, 24 Oct 2023 02:05:01 GMT Received: from mxout22.s.uw.edu (mxout22.s.uw.edu [128.95.242.222]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3twydytnmv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 02:05:01 +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 39O24q19025082 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 23 Oct 2023 19:04:52 -0700 X-Auth-Received: from kmatsui-ThinkPad-X1-Carbon-Gen-9.dhcp4.washington.edu ([10.19.18.191]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 39O24TmV031305 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 23 Oct 2023 19:04:52 -0700 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 v25 33/33] libstdc++: Optimize std::is_invocable compilation performance Date: Mon, 23 Oct 2023 19:01:16 -0700 Message-ID: <20231024020424.699427-34-kmatsui@gcc.gnu.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231024020424.699427-1-kmatsui@gcc.gnu.org> References: <20231020162115.2307797-1-kmatsui@gcc.gnu.org> <20231024020424.699427-1-kmatsui@gcc.gnu.org> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: a_L4xsywBl_WsXelUNaB7bxGlQ0MafoT X-Proofpoint-GUID: a_L4xsywBl_WsXelUNaB7bxGlQ0MafoT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-10-24_01,2023-10-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1034 impostorscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2310170001 definitions=main-2310240017 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NEUTRAL, 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.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: 1780284538906999082 X-GMAIL-MSGID: 1780601148713568447 This patch optimizes the compilation performance of std::is_invocable by dispatching to the new __is_invocable built-in trait. libstdc++-v3/ChangeLog: * include/std/type_traits (is_invocable): Use __is_invocable built-in trait. * testsuite/20_util/is_invocable/incomplete_args_neg.cc: Handle the new error from __is_invocable. * testsuite/20_util/is_invocable/incomplete_neg.cc: Likewise. Signed-off-by: Ken Matsui --- libstdc++-v3/include/std/type_traits | 6 ++++++ .../testsuite/20_util/is_invocable/incomplete_args_neg.cc | 1 + .../testsuite/20_util/is_invocable/incomplete_neg.cc | 1 + 3 files changed, 8 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 75a94cb8d7e..91851b78c7e 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -3167,9 +3167,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using invoke_result_t = typename invoke_result<_Fn, _Args...>::type; /// std::is_invocable +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_invocable) + template + struct is_invocable + : public __bool_constant<__is_invocable(_Fn, _ArgTypes...)> +#else template struct is_invocable : __is_invocable_impl<__invoke_result<_Fn, _ArgTypes...>, void>::type +#endif { static_assert(std::__is_complete_or_unbounded(__type_identity<_Fn>{}), "_Fn must be a complete class or an unbounded array"); diff --git a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc index 34d1d9431d1..3f9e5274f3c 100644 --- a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_args_neg.cc @@ -18,6 +18,7 @@ // . // { dg-error "must be a complete class" "" { target *-*-* } 0 } +// { dg-prune-output "invalid use of incomplete type" } #include diff --git a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc index e1e54d25ee5..92af48c48b6 100644 --- a/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc +++ b/libstdc++-v3/testsuite/20_util/is_invocable/incomplete_neg.cc @@ -18,6 +18,7 @@ // . // { dg-error "must be a complete class" "" { target *-*-* } 0 } +// { dg-prune-output "invalid use of incomplete type" } #include