From patchwork Mon Jun 26 16:43:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 113048 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7614394vqr; Mon, 26 Jun 2023 09:47:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4nsOnSXX4Cs4Cnzl0N4Jr8Nax/Qpp+y3NyPby3YWMDBH36ow1mJ0X1e0K4ZGWcfmgs5KIm X-Received: by 2002:a05:651c:104:b0:2b5:80dd:5e6d with SMTP id a4-20020a05651c010400b002b580dd5e6dmr9623964ljb.50.1687798021860; Mon, 26 Jun 2023 09:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687798021; cv=none; d=google.com; s=arc-20160816; b=aMopcHQsRsGQHRTGcmPt23OIpl4Av3DAdxtAi7og39rTBlx0i595DoUMdpVNG5BhUw lwWZLXXc3WCdTxXp0OegW/VcJG98jN7cDH7OtS7jkXXta8Efsdw+DvIFwmqO5voQU0lG yJz2tU42Xhy8thnJ5eoj4kyDX0y+7OdPyDKXxnJednV8wO7bIso2xpqJKSTNDV6XXwoc asUGesenTEhpKKbxWBcPMejiP4dNfKcI9VEfoeynaFuLgT1oRLot8xBBAKeFNWKshuOm CGmyVzyMqapQFC7W6oD3K6TDyGfF6DtxBg3n6dYEd5NCPcsEypGgH+Y1fAb/SHaJmCOV +sKw== 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:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=A4NXH2nt+G4BDGb/eu3C/xrs3xzT+o6piHc9/jwiolE=; fh=sJ+2/4g29YdyXkoRrFZSpsL2zxijepB7X/1rB0LDDh8=; b=rJAb2CD8Q2XKrXmAiTGg//YmuuJHXCYtOlNPeDa7MAMBhthXJiadzL63YhxbWXsLrY rxB5MMW/vQk20452XrXIccBtfIV5ouJPOzuufTWbAddmwkgGywXGqmdFX7z+hRsDqKpT +svKMPe7M45O53CViVEQmTCIcpkXRy/BTp0tY6CtNq0imn0Uonnb/QrLxhJJEn2iWfuv uDJrE9vz1Wt5e8VLcnfRqAToemM8o6Sq0vXNL04nRihbSVthfS/QPNNKNbeS+1IcRJ/1 Vw4qICmlSObiRJbSZsIKoKt3LGq1dRJ/mZlPfyPLW3FPPWB6DqWVpauq8sqndU6dl/ku RsAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="E/Ndbzb3"; 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 r16-20020a170906549000b0098d2f718ac3si2918972ejo.609.2023.06.26.09.47.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 09:47:01 -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="E/Ndbzb3"; 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 4011138555A9 for ; Mon, 26 Jun 2023 16:45:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4011138555A9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687797918; bh=A4NXH2nt+G4BDGb/eu3C/xrs3xzT+o6piHc9/jwiolE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=E/Ndbzb3AQC2KEfDp2lj9ddF511cG5t8um+PdXET/tO5Rnut/MV6+JeHdAQwJWL80 qFgUmTG/YrNh0JNnwQ9lWO8KVwWh/ZweKybI9RqoKwHQftFLTYBV34+uVxKSh/Sb9M s7yb5tARogtyC57l2I+bY2r4LJ40MJx0mvrUUl84= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 5F098385773F for ; Mon, 26 Jun 2023 16:43:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5F098385773F Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-PiDoqz2TM4KkhWen4kxIpQ-1; Mon, 26 Jun 2023 12:43:54 -0400 X-MC-Unique: PiDoqz2TM4KkhWen4kxIpQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E2191C0690D; Mon, 26 Jun 2023 16:43:51 +0000 (UTC) Received: from localhost (unknown [10.42.28.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41516C1ED97; Mon, 26 Jun 2023 16:43:51 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Implement P2538R1 ADL-proof std::projected Date: Mon, 26 Jun 2023 17:43:46 +0100 Message-ID: <20230626164350.270495-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 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_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely 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?1769784498746771602?= X-GMAIL-MSGID: =?utf-8?q?1769784498746771602?= Tested x86_64-linux. Pushed to trunk. -- >8 -- This was recently approved for C++26, but there's no harm in implementing it unconditionally for C++20 and C++23. As it says in the paper, it doesn't change the meaning of any valid code. It only enables things that were previously ill-formed for questionable reasons. libstdc++-v3/ChangeLog: * include/bits/iterator_concepts.h (projected): Replace class template with alias template denoting an ADL-proofed helper. (incremental_traits>): Remove. * testsuite/24_iterators/indirect_callable/projected-adl.cc: New test. --- libstdc++-v3/include/bits/iterator_concepts.h | 35 +++++++++++----- .../indirect_callable/projected-adl.cc | 42 +++++++++++++++++++ 2 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index 1555c374870..6802582a459 100644 --- a/libstdc++-v3/include/bits/iterator_concepts.h +++ b/libstdc++-v3/include/bits/iterator_concepts.h @@ -771,19 +771,34 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && invocable<_Fn, iter_reference_t<_Is>...> using indirect_result_t = invoke_result_t<_Fn, iter_reference_t<_Is>...>; + namespace __detail + { + template + struct __projected + { + struct __type + { + using value_type = remove_cvref_t>; + indirect_result_t<_Proj&, _Iter> operator*() const; // not defined + }; + }; + + template + struct __projected<_Iter, _Proj> + { + struct __type + { + using value_type = remove_cvref_t>; + using difference_type = iter_difference_t<_Iter>; + indirect_result_t<_Proj&, _Iter> operator*() const; // not defined + }; + }; + } // namespace __detail + /// [projected], projected template _Proj> - struct projected - { - using value_type = remove_cvref_t>; - - indirect_result_t<_Proj&, _Iter> operator*() const; // not defined - }; - - template - struct incrementable_traits> - { using difference_type = iter_difference_t<_Iter>; }; + using projected = __detail::__projected<_Iter, _Proj>::__type; // [alg.req], common algorithm requirements diff --git a/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc b/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc new file mode 100644 index 00000000000..4c2a0955c6e --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/indirect_callable/projected-adl.cc @@ -0,0 +1,42 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +// P2538R1 ADL-proof std::projected +// https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2538r1.html + +#include + +template + concept has_diff_type = requires { typename T::difference_type; }; + +static_assert( has_diff_type> ); + +struct Indy { + using value_type = int; + int operator*() const { return 0; } +}; +static_assert( ! std::weakly_incrementable ); +static_assert( ! has_diff_type> ); + + +// Examples from the paper: + +template struct Holder { T t; }; +struct Incomplete; + +void test_concepts() +{ + using T = Holder*; + static_assert(std::equality_comparable); + (void) std::indirectly_comparable>; + (void) std::sortable; +} + +#include + +void test_count() +{ + Holder* a = nullptr; + (void) std::count(&a, &a, nullptr); + (void) std::ranges::count(&a, &a, nullptr); // { dg-bogus "." } +}