From patchwork Mon Nov 1 23:52:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 46933 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9A0F03858432 for ; Mon, 1 Nov 2021 23:54:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9A0F03858432 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1635810860; bh=RWzyWuI7hP/bGSRhZhmtbK3crN2BoZWFC5kTUpUVkrE=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=lAxN/T72zyw9d/WOHO+TyS1QbzMU6pOqL6nk4AurR0onLpn98U73ic35aoeaIBgla hjDziKPsh30cGvfrPJ/AqFZj4ixszo53GeraPv2NbN+PO5kjGRYEqV1Lji1uZtByfa 9JnSfh4Wr/Upc+kS///W3SR/EMmIPOnpg4F1t19w= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id BA7AF3858038 for ; Mon, 1 Nov 2021 23:52:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BA7AF3858038 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-271-irGHBshdOjGxXw-IMBzA1w-1; Mon, 01 Nov 2021 19:52:22 -0400 X-MC-Unique: irGHBshdOjGxXw-IMBzA1w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E5A2802682; Mon, 1 Nov 2021 23:52:21 +0000 (UTC) Received: from localhost (unknown [10.33.36.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id D38F55D9DC; Mon, 1 Nov 2021 23:52:20 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Missing constexpr for __gnu_debug::__valid_range etc Date: Mon, 1 Nov 2021 23:52:20 +0000 Message-Id: <20211101235220.1457278-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested powerpc64le-linux, pushed to trunk. The new 25_algorithms/move/constexpr.cc test fails in debug mode, because the debug assertions use the non-constexpr overloads in . libstdc++-v3/ChangeLog: * include/debug/stl_iterator.h (__valid_range): Add constexpr for C++20. Qualify call to avoid ADL. (__get_distance, __can_advance, __unsafe, __base): Likewise. * testsuite/25_algorithms/move/constexpr.cc: Also check with std::reverse_iterator arguments. --- libstdc++-v3/include/debug/stl_iterator.h | 32 ++++++++++++++----- .../testsuite/25_algorithms/move/constexpr.cc | 11 +++++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/debug/stl_iterator.h b/libstdc++-v3/include/debug/stl_iterator.h index edeb42ebe98..54f7d42b074 100644 --- a/libstdc++-v3/include/debug/stl_iterator.h +++ b/libstdc++-v3/include/debug/stl_iterator.h @@ -35,31 +35,38 @@ namespace __gnu_debug { // Help Debug mode to see through reverse_iterator. template + _GLIBCXX20_CONSTEXPR inline bool __valid_range(const std::reverse_iterator<_Iterator>& __first, const std::reverse_iterator<_Iterator>& __last, typename _Distance_traits<_Iterator>::__type& __dist) - { return __valid_range(__last.base(), __first.base(), __dist); } + { + return __gnu_debug::__valid_range(__last.base(), __first.base(), __dist); + } template + _GLIBCXX20_CONSTEXPR inline typename _Distance_traits<_Iterator>::__type __get_distance(const std::reverse_iterator<_Iterator>& __first, const std::reverse_iterator<_Iterator>& __last) - { return __get_distance(__last.base(), __first.base()); } + { return __gnu_debug::__get_distance(__last.base(), __first.base()); } template + _GLIBCXX20_CONSTEXPR inline bool __can_advance(const std::reverse_iterator<_Iterator>& __it, _Size __n) - { return __can_advance(__it.base(), -__n); } + { return __gnu_debug::__can_advance(__it.base(), -__n); } template + _GLIBCXX20_CONSTEXPR inline bool __can_advance(const std::reverse_iterator<_Iterator>& __it, const std::pair<_Diff, _Distance_precision>& __dist, int __way) - { return __can_advance(__it.base(), __dist, -__way); } + { return __gnu_debug::__can_advance(__it.base(), __dist, -__way); } template + _GLIBCXX20_CONSTEXPR inline std::reverse_iterator<_Iterator> __base(const std::reverse_iterator<_Safe_iterator< _Iterator, _Sequence, std::random_access_iterator_tag> >& __it) @@ -82,6 +89,7 @@ namespace __gnu_debug } #else template + _GLIBCXX20_CONSTEXPR inline auto __unsafe(const std::reverse_iterator<_Iterator>& __it) -> decltype(std::__make_reverse_iterator(__unsafe(__it.base()))) @@ -91,37 +99,45 @@ namespace __gnu_debug #if __cplusplus >= 201103L // Help Debug mode to see through move_iterator. template + _GLIBCXX20_CONSTEXPR inline bool __valid_range(const std::move_iterator<_Iterator>& __first, const std::move_iterator<_Iterator>& __last, typename _Distance_traits<_Iterator>::__type& __dist) - { return __valid_range(__first.base(), __last.base(), __dist); } + { + return __gnu_debug::__valid_range(__first.base(), __last.base(), __dist); + } template + _GLIBCXX20_CONSTEXPR inline typename _Distance_traits<_Iterator>::__type __get_distance(const std::move_iterator<_Iterator>& __first, const std::move_iterator<_Iterator>& __last) - { return __get_distance(__first.base(), __last.base()); } + { return __gnu_debug::__get_distance(__first.base(), __last.base()); } template + _GLIBCXX20_CONSTEXPR inline bool __can_advance(const std::move_iterator<_Iterator>& __it, _Size __n) - { return __can_advance(__it.base(), __n); } + { return __gnu_debug::__can_advance(__it.base(), __n); } template + _GLIBCXX20_CONSTEXPR inline bool __can_advance(const std::move_iterator<_Iterator>& __it, const std::pair<_Diff, _Distance_precision>& __dist, int __way) - { return __can_advance(__it.base(), __dist, __way); } + { return __gnu_debug::__can_advance(__it.base(), __dist, __way); } template + _GLIBCXX20_CONSTEXPR inline auto __unsafe(const std::move_iterator<_Iterator>& __it) -> decltype(std::make_move_iterator(__unsafe(__it.base()))) { return std::make_move_iterator(__unsafe(__it.base())); } template + _GLIBCXX20_CONSTEXPR inline auto __base(const std::move_iterator<_Iterator>& __it) -> decltype(std::make_move_iterator(__base(__it.base()))) diff --git a/libstdc++-v3/testsuite/25_algorithms/move/constexpr.cc b/libstdc++-v3/testsuite/25_algorithms/move/constexpr.cc index 773c55cfb50..eb1f3b17e72 100644 --- a/libstdc++-v3/testsuite/25_algorithms/move/constexpr.cc +++ b/libstdc++-v3/testsuite/25_algorithms/move/constexpr.cc @@ -17,3 +17,14 @@ test01() } static_assert(test01()); + +constexpr bool +test02() +{ + int x[2] = {1,2}, y[2]; + std::span in(x), out(y); + std::move(in.rbegin(), in.rend(), out.rbegin()); + return std::equal(in.rbegin(), in.rend(), out.rbegin()); +} + +static_assert(test02());