From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0E50438582BC for ; Tue, 27 Sep 2022 11:00:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0E50438582BC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664276417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2VeFMzKgRp7cKnnWQVm4BIOEA2DmeRNu0+iuoq9ujgA=; b=P+1QW1wd+a2ltcTPN1qq/1xoEL8Eb8DypRSotLH8Cti2joy0wOLsIktXuPpofIVW/rOPPQ U9LLWy0Fnc8dGyNEnsFakr4S01XTncMgKX3obpXozZ4jXaQ+MRhpr1w+7+iMFd3WggA2mP 83SeAX2VBurSdn5UjJYBc/1wCl2XthU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-385-gxs0Mgz8Ob-Cdg6avmYNtw-1; Tue, 27 Sep 2022 07:00:14 -0400 X-MC-Unique: gxs0Mgz8Ob-Cdg6avmYNtw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3B13786EB32; Tue, 27 Sep 2022 11:00:14 +0000 (UTC) Received: from localhost (unknown [10.33.36.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02F512166B26; Tue, 27 Sep 2022 11:00:13 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Adjust deduction guides for static operator() [PR106651] Date: Tue, 27 Sep 2022 12:00:13 +0100 Message-Id: <20220927110013.2378598-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux. Pushed to trunk. -- >8 -- Adjust the deduction guides for std::function and std::packaged_task to work with static call operators. This finishes the implementation of P1169R4 for C++23. libstdc++-v3/ChangeLog: PR c++/106651 * include/bits/std_function.h (__function_guide_t): New alias template. [__cpp_static_call_operator] (__function_guide_static_helper): New class template. (function): Use __function_guide_t in deduction guide. * include/std/future (packaged_task): Use __function_guide_t in deduction guide. * testsuite/20_util/function/cons/deduction_c++23.cc: New test. * testsuite/30_threads/packaged_task/cons/deduction_c++23.cc: New test. --- libstdc++-v3/include/bits/std_function.h | 25 ++++++++++++++++--- libstdc++-v3/include/std/future | 4 +-- .../20_util/function/cons/deduction_c++23.cc | 23 +++++++++++++++++ .../packaged_task/cons/deduction_c++23.cc | 23 +++++++++++++++++ 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc create mode 100644 libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc diff --git a/libstdc++-v3/include/bits/std_function.h b/libstdc++-v3/include/bits/std_function.h index 96918a04a35..f5423a3a5c7 100644 --- a/libstdc++-v3/include/bits/std_function.h +++ b/libstdc++-v3/include/bits/std_function.h @@ -697,12 +697,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > { using type = _Res(_Args...); }; +#if __cpp_static_call_operator >= 202207L && __cpp_concepts >= 202002L + template + struct __function_guide_static_helper + { }; + + template + struct __function_guide_static_helper<_Res (*) (_Args...) noexcept(_Nx)> + { using type = _Res(_Args...); }; + + template + using __function_guide_t = typename __conditional_t< + requires (_Fn& __f) { (void) __f.operator(); }, + __function_guide_static_helper<_Op>, + __function_guide_helper<_Op>>::type; +#else + template + using __function_guide_t = typename __function_guide_helper<_Op>::type; +#endif + template function(_Res(*)(_ArgTypes...)) -> function<_Res(_ArgTypes...)>; - template::type> - function(_Functor) -> function<_Signature>; + template> + function(_Fn) -> function<_Signature>; #endif // [20.7.15.2.6] null pointer comparisons diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index a1b2d7f1d3a..cf08c155a24 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1649,8 +1649,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template packaged_task(_Res(*)(_ArgTypes...)) -> packaged_task<_Res(_ArgTypes...)>; - template::type> + template> packaged_task(_Fun) -> packaged_task<_Signature>; #endif diff --git a/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc b/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc new file mode 100644 index 00000000000..17454ea4108 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/function/cons/deduction_c++23.cc @@ -0,0 +1,23 @@ +// { dg-options "-std=gnu++23" } +// { dg-do compile { target c++23 } } + +#include + +template struct require_same; +template struct require_same { using type = void; }; + +template + typename require_same::type + check_type(U&) { } + +void +test_static_call_operator() +{ + struct F1 { static long operator()() { return 0; } }; + std::function func1 = F1{}; + check_type>(func1); + + struct F2 { static float operator()(char, void*) noexcept { return 0; } }; + std::function func2 = F2{}; + check_type>(func2); +} diff --git a/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc new file mode 100644 index 00000000000..e36edfa0359 --- /dev/null +++ b/libstdc++-v3/testsuite/30_threads/packaged_task/cons/deduction_c++23.cc @@ -0,0 +1,23 @@ +// { dg-options "-std=gnu++23" } +// { dg-do compile { target c++23 } } + +#include + +template struct require_same; +template struct require_same { using type = void; }; + +template + typename require_same::type + check_type(U&) { } + +void +test_static_call_operator() +{ + struct F1 { static long operator()() { return 0; } }; + std::packaged_task task1{ F1{} }; + check_type>(task1); + + struct F2 { static float operator()(char, void*) noexcept { return 0; } }; + std::packaged_task task2{ F2{} }; + check_type>(task2); +} -- 2.37.3