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.133.124]) by sourceware.org (Postfix) with ESMTP id D835F39AFC34 for ; Fri, 23 Jul 2021 16:34:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D835F39AFC34 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-176-IpJ58M01OiCiVtH-faUy2A-1; Fri, 23 Jul 2021 12:34:51 -0400 X-MC-Unique: IpJ58M01OiCiVtH-faUy2A-1 Received: by mail-qv1-f70.google.com with SMTP id h12-20020a0562140dacb029030449450d37so2091634qvh.14 for ; Fri, 23 Jul 2021 09:34:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BQukrmDx8Oxc+Qp5QnvFBF+8a+gRjBXnB4E3uSDkdn8=; b=kJMr/54nS0oQyAWak9BC7nXNrKzxrbf50wYR/6Ju+kJST9xIYSgEW8Ku3UXuevbm16 sXRUPJhXSteAYHX58oRLS3tjWAAjYmUbICzo2LxYtTp94npiEGvn2QTKsm2EPseYv5YK VMHMJIJOJdlRQNYMMyxxuiKtuSoSR0vFmAZoi6a2RFFze9mIgeibf/vAbTxF1zQQVOtD Knge4Vumr4fRi4g51Rm6hVzlOqdLD/6ixM8+DsPyhz0Se6j30HsVqtiGQcbmH3JHOeDH 3zbaXReeH7jgiE3BBO7cCvjanJ/9SNNWrxBPQ/bEyukAFuR6JmtnItlT3OPKfSj7CMXI 4QyQ== X-Gm-Message-State: AOAM530QyfGNjKQwnYQ+muJrGRKHjojSbAE4ZgDzYYlNcQU70lp1MZYQ 25alqahoiy2CuYsW0LXLLzBmzLxVSKvbLwEW7+5NgD1YH+HMuuBFVQIswrK9p2ceFhY8OY7Jf/B nYFNjZxdABTrb547evdtB2ha71jn90tlt5ZCnk7LZcZZknO2Y7WlzXztq0G+2Iot/2/U= X-Received: by 2002:a0c:fba7:: with SMTP id m7mr5762477qvp.50.1627058090896; Fri, 23 Jul 2021 09:34:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8l8mavTuBx6hsy4rSv9ZWvob8S4JajanZHDdA4eHJDYpDPrgs91gYjMt+KQJ03rmyCInI/g== X-Received: by 2002:a0c:fba7:: with SMTP id m7mr5762454qvp.50.1627058090685; Fri, 23 Jul 2021 09:34:50 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id t64sm14553951qkd.71.2021.07.23.09.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 09:34:50 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Add missing std::move in ranges::copy/move/reverse_copy [PR101599] Date: Fri, 23 Jul 2021 12:34:48 -0400 Message-Id: <20210723163448.3293782-1-ppalka@redhat.com> X-Mailer: git-send-email 2.32.0.349.gdaab8a564f MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-16.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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham 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-List-Received-Date: Fri, 23 Jul 2021 16:34:55 -0000 In passing, this also renames the template parameter _O2 to _Out2 in ranges::partition_copy and uglify its function parameters out_true and out_false. Tested on x86_64-pc-linux-gnu, does this look OK for trunk+branches? PR libstdc++/101599 libstdc++-v3/ChangeLog: * include/bits/ranges_algo.h (__reverse_copy_fn::operator()): Add missing std::move in return statement. (__partition_copy_fn::operator()): Rename templtae parameter _O2 to _Out2. Uglify function parameters out_true and out_false. * include/bits/ranges_algobase.h (__copy_or_move): Add missing std::move to recursive call that unwraps a __normal_iterator output iterator. * testsuite/25_algorithms/copy/constrained.cc (test06): New test. * testsuite/25_algorithms/move/constrained.cc (test05): New test. --- libstdc++-v3/include/bits/ranges_algo.h | 20 +++++++++---------- libstdc++-v3/include/bits/ranges_algobase.h | 2 +- .../25_algorithms/copy/constrained.cc | 13 ++++++++++++ .../25_algorithms/move/constrained.cc | 13 ++++++++++++ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/include/bits/ranges_algo.h b/libstdc++-v3/include/bits/ranges_algo.h index 83371a4bdf0..8462521c369 100644 --- a/libstdc++-v3/include/bits/ranges_algo.h +++ b/libstdc++-v3/include/bits/ranges_algo.h @@ -1343,7 +1343,7 @@ namespace ranges *__result = *__tail; ++__result; } - return {__i, __result}; + return {__i, std::move(__result)}; } template @@ -2423,14 +2423,14 @@ namespace ranges struct __partition_copy_fn { template _Sent, - weakly_incrementable _Out1, weakly_incrementable _O2, + weakly_incrementable _Out1, weakly_incrementable _Out2, typename _Proj = identity, indirect_unary_predicate> _Pred> requires indirectly_copyable<_Iter, _Out1> - && indirectly_copyable<_Iter, _O2> - constexpr partition_copy_result<_Iter, _Out1, _O2> + && indirectly_copyable<_Iter, _Out2> + constexpr partition_copy_result<_Iter, _Out1, _Out2> operator()(_Iter __first, _Sent __last, - _Out1 __out_true, _O2 __out_false, + _Out1 __out_true, _Out2 __out_false, _Pred __pred, _Proj __proj = {}) const { for (; __first != __last; ++__first) @@ -2450,18 +2450,18 @@ namespace ranges } template, _Proj>> _Pred> requires indirectly_copyable, _Out1> - && indirectly_copyable, _O2> - constexpr partition_copy_result, _Out1, _O2> - operator()(_Range&& __r, _Out1 out_true, _O2 out_false, + && indirectly_copyable, _Out2> + constexpr partition_copy_result, _Out1, _Out2> + operator()(_Range&& __r, _Out1 __out_true, _Out2 __out_false, _Pred __pred, _Proj __proj = {}) const { return (*this)(ranges::begin(__r), ranges::end(__r), - std::move(out_true), std::move(out_false), + std::move(__out_true), std::move(__out_false), std::move(__pred), std::move(__proj)); } }; diff --git a/libstdc++-v3/include/bits/ranges_algobase.h b/libstdc++-v3/include/bits/ranges_algobase.h index c1037657c4c..78c295981d5 100644 --- a/libstdc++-v3/include/bits/ranges_algobase.h +++ b/libstdc++-v3/include/bits/ranges_algobase.h @@ -244,7 +244,7 @@ namespace ranges else if constexpr (__is_normal_iterator<_Out>) { auto [__in,__out] - = ranges::__copy_or_move<_IsMove>(__first, __last, __result.base()); + = ranges::__copy_or_move<_IsMove>(std::move(__first), __last, __result.base()); return {std::move(__in), decltype(__result){__out}}; } else if constexpr (sized_sentinel_for<_Sent, _Iter>) diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc index 77ecf99d5b1..a05948a49c6 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc @@ -26,6 +26,7 @@ using __gnu_test::test_container; using __gnu_test::test_range; using __gnu_test::input_iterator_wrapper; +using __gnu_test::input_iterator_wrapper_nocopy; using __gnu_test::output_iterator_wrapper; using __gnu_test::forward_iterator_wrapper; @@ -214,6 +215,17 @@ test05() return ok; } +void +test06() +{ + // PR libstdc++/101599 + int x[] = {1,2,3}; + test_range rx(x); + std::vector v(4, 0); + ranges::copy(rx, v.begin()); + VERIFY( ranges::equal(v, (int[]){1,2,3,0}) ); +} + int main() { @@ -222,4 +234,5 @@ main() static_assert(test03()); test04(); static_assert(test05()); + test06(); } diff --git a/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc index 1cdfbdf23bc..2ce27b663a2 100644 --- a/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc @@ -26,6 +26,7 @@ using __gnu_test::test_container; using __gnu_test::test_range; using __gnu_test::input_iterator_wrapper; +using __gnu_test::input_iterator_wrapper_nocopy; using __gnu_test::output_iterator_wrapper; using __gnu_test::forward_iterator_wrapper; @@ -193,6 +194,17 @@ test04() VERIFY( ranges::count(y, 0, &X::moved) == 6 ); } +void +test05() +{ + // PR libstdc++/101599 + int x[] = {1,2,3}; + test_range rx(x); + std::vector v(4, 0); + ranges::move(rx, v.begin()); + VERIFY( ranges::equal(v, (int[]){1,2,3,0}) ); +} + int main() { @@ -200,4 +212,5 @@ main() test02(); static_assert(test03()); test04(); + test05(); } -- 2.32.0.349.gdaab8a564f