From patchwork Tue Sep 28 19:25:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1534045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=qvy4y06/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HJqLf3JFFz9t0k for ; Wed, 29 Sep 2021 05:28:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3C424385800D for ; Tue, 28 Sep 2021 19:28:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C424385800D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1632857336; bh=bSyS2zP7vfE9SBvBMPHSt3zRBp9lkNElmekLShBvr3s=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=qvy4y06/MbH7DWqYlE08nOUForTOTf/dZZT8BO6mVLyIY26QxXNqnJm35hzLKf4hx r57Wz9qYqCWm8KBrhBap4Gju3IdxTl7dr8CaFMn9weL7GBfRz1sKCyCDgjVMc2ozuj B3OFmTBYmo9LGXlja6uESzmdC8uDPowMAdQT1+P0= 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 ESMTP id ABFCA3858412 for ; Tue, 28 Sep 2021 19:25:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ABFCA3858412 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-595-txCdbsVoOHGvXgWsvzWLow-1; Tue, 28 Sep 2021 15:25:23 -0400 X-MC-Unique: txCdbsVoOHGvXgWsvzWLow-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C32C218414A7; Tue, 28 Sep 2021 19:25:22 +0000 (UTC) Received: from localhost (unknown [10.33.36.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7353160C13; Tue, 28 Sep 2021 19:25:22 +0000 (UTC) Date: Tue, 28 Sep 2021 20:25:21 +0100 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix _OutputIteratorConcept checks in algorithms Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-14.5 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The _OutputIteratorConcept should be checked using the correct value category. The std::move_backward and std::copy_backward algorithms should use _OutputIteratorConcept instead of _ConvertibleConcept. In order to use the correct value category, the concept should use a function that returns _ValueT instead of using an lvalue data member. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/boost_concept_check.h (_OutputIteratorConcept): Use a function to preserve value category of the type. * include/bits/stl_algobase.h (copy, move, fill_n): Use a reference as the second argument for _OutputIteratorConcept. (copy_backward, move_backward): Use _OutputIteratorConcept instead of _ConvertibleConcept. Tested x86_64-linux. Committed to trunk. commit 45a8cd256934be3770f7e000db7b13f10eabee9a Author: Jonathan Wakely Date: Fri Sep 24 15:35:20 2021 libstdc++: Fix _OutputIteratorConcept checks in algorithms The _OutputIteratorConcept should be checked using the correct value category. The std::move_backward and std::copy_backward algorithms should use _OutputIteratorConcept instead of _ConvertibleConcept. In order to use the correct value category, the concept should use a function that returns _ValueT instead of using an lvalue data member. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/boost_concept_check.h (_OutputIteratorConcept): Use a function to preserve value category of the type. * include/bits/stl_algobase.h (copy, move, fill_n): Use a reference as the second argument for _OutputIteratorConcept. (copy_backward, move_backward): Use _OutputIteratorConcept instead of _ConvertibleConcept. diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h index 5c87e32f36b..ba36c24abec 100644 --- a/libstdc++-v3/include/bits/boost_concept_check.h +++ b/libstdc++-v3/include/bits/boost_concept_check.h @@ -464,10 +464,10 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; __function_requires< _AssignableConcept<_Tp> >(); ++__i; // require preincrement operator __i++; // require postincrement operator - *__i++ = __t; // require postincrement and assignment + *__i++ = __val(); // require postincrement and assignment } _Tp __i; - _ValueT __t; + _ValueT __val() const; }; template diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index d0c49628d7f..e1443b8a92a 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -613,7 +613,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_II>) __glibcxx_function_requires(_OutputIteratorConcept<_OI, - typename iterator_traits<_II>::value_type>) + typename iterator_traits<_II>::reference>) __glibcxx_requires_can_increment_range(__first, __last, __result); return std::__copy_move_a<__is_move_iterator<_II>::__value> @@ -646,7 +646,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER // concept requirements __glibcxx_function_requires(_InputIteratorConcept<_II>) __glibcxx_function_requires(_OutputIteratorConcept<_OI, - typename iterator_traits<_II>::value_type>) + typename iterator_traits<_II>::value_type&&>) __glibcxx_requires_can_increment_range(__first, __last, __result); return std::__copy_move_a(std::__miter_base(__first), @@ -850,9 +850,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER // concept requirements __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>) __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>) - __glibcxx_function_requires(_ConvertibleConcept< - typename iterator_traits<_BI1>::value_type, - typename iterator_traits<_BI2>::value_type>) + __glibcxx_function_requires(_OutputIteratorConcept<_BI2, + typename iterator_traits<_BI1>::reference>) __glibcxx_requires_can_decrement_range(__first, __last, __result); return std::__copy_move_backward_a<__is_move_iterator<_BI1>::__value> @@ -886,9 +885,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER // concept requirements __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>) __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>) - __glibcxx_function_requires(_ConvertibleConcept< - typename iterator_traits<_BI1>::value_type, - typename iterator_traits<_BI2>::value_type>) + __glibcxx_function_requires(_OutputIteratorConcept<_BI2, + typename iterator_traits<_BI1>::value_type&&>) __glibcxx_requires_can_decrement_range(__first, __last, __result); return std::__copy_move_backward_a(std::__miter_base(__first), @@ -1144,7 +1142,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER fill_n(_OI __first, _Size __n, const _Tp& __value) { // concept requirements - __glibcxx_function_requires(_OutputIteratorConcept<_OI, _Tp>) + __glibcxx_function_requires(_OutputIteratorConcept<_OI, const _Tp&>) return std::__fill_n_a(__first, std::__size_to_integer(__n), __value, std::__iterator_category(__first));