libstdc++: -D_GLIBCXX_DEBUG fixes in the constrained algos tests

Message ID	20200227154224.1533311-1-ppalka@redhat.com
State	New
Headers	show Return-Path: <gcc-patches-return-520257-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=XcVJmhZBiCb0gR2v DUBGkeKAozZACRS8VqiqZnJJATR2Er2faQaDZFSk1r6J41IrSl4wGLg/wday3ds+ 9LzSStx5f+h67DIOx3hsWks/0IV4e5SbDHBgml3el7HWuM+brHMp2cfOFxgxS5Eh BIJm9Gn+Um4J43wn5lEKNnlz7wg= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org From: Patrick Palka <ppalka@redhat.com> To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka <ppalka@redhat.com> Subject: [PATCH] libstdc++: -D_GLIBCXX_DEBUG fixes in the constrained algos tests Date: Thu, 27 Feb 2020 10:42:24 -0500 Message-Id: <20200227154224.1533311-1-ppalka@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable
Series	libstdc++: -D_GLIBCXX_DEBUG fixes in the constrained algos tests \| expand libstdc++: -D_GLIBCXX_DEBUG fixes in the constrained algos tests

diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc index 85f7d649608..aafe845db3a 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/constrained.cc @@ -70,8 +70,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::copy(x, ranges::begin(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data()+3 ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -81,8 +81,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::copy(x, ranges::begin(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data()+3 ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -93,8 +93,8 @@ test01() auto [in,out] = ranges::copy(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.end())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data() ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -105,8 +105,8 @@ test01() auto [in,out] = ranges::copy(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.end())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data() ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } } diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_backward/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/constrained.cc index 900f78aaa73..9df2a2ff593 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy_backward/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/constrained.cc @@ -57,8 +57,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::copy_backward(x, ranges::end(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data() ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -68,8 +68,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::copy_backward(x, ranges::end(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data() ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -80,8 +80,8 @@ test01() auto [in,out] = ranges::copy_backward(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.begin())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data()+3 ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -92,8 +92,8 @@ test01() auto [in,out] = ranges::copy_backward(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.begin())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data()+3 ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } } diff --git a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc index 856056865d9..e6e16c85382 100644 --- a/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/inplace_merge/constrained.cc @@ -40,7 +40,7 @@ test01() v.insert(v.end(), x, x+j); ranges::sort(v); - test_range<int, bidirectional_iterator_wrapper> rz(&v[0], &v[0]+i+j); + test_range<int, bidirectional_iterator_wrapper> rz(v.data(), v.data()+i+j); auto result = ranges::inplace_merge(rz, next(ranges::begin(rz), i)); VERIFY( result == rz.end() ); diff --git a/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc index d205b3572a1..f15de548709 100644 --- a/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/move/constrained.cc @@ -99,8 +99,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::move(x, ranges::begin(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data()+3 ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -110,8 +110,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::move(x, ranges::begin(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data()+3 ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -122,8 +122,8 @@ test01() auto [in,out] = ranges::move(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.end())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data() ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -134,8 +134,8 @@ test01() auto [in,out] = ranges::move(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.end())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data() ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } } diff --git a/libstdc++-v3/testsuite/25_algorithms/move_backward/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/move_backward/constrained.cc index 3c4aa5dc70d..14f215578c7 100644 --- a/libstdc++-v3/testsuite/25_algorithms/move_backward/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/move_backward/constrained.cc @@ -86,8 +86,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::move_backward(x, ranges::end(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data() ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -97,8 +97,8 @@ test01() std::vector<int> y(3); const int z[3] = { 1, 2, 3 }; auto [in, out] = ranges::move_backward(x, ranges::end(y)); - VERIFY( in.base() == x.data()+3 ); - VERIFY( out.base() == y.data() ); + VERIFY( in == x.begin()+3 ); + VERIFY( out == y.begin() ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -109,8 +109,8 @@ test01() auto [in,out] = ranges::move_backward(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.begin())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data()+3 ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } @@ -121,8 +121,8 @@ test01() auto [in,out] = ranges::move_backward(make_reverse_iterator(x.end()), make_reverse_iterator(x.begin()), make_reverse_iterator(y.begin())); - VERIFY( in.base().base() == x.data()+3 ); - VERIFY( out.base().base() == y.data()+3 ); + VERIFY( in.base() == x.begin()+3 ); + VERIFY( out.base() == y.begin()+3 ); VERIFY( ranges::equal(y, z) && ranges::equal(x, z) ); } } diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort/constrained.cc index 430e3c0b61b..3b61fe73fd7 100644 --- a/libstdc++-v3/testsuite/25_algorithms/partial_sort/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort/constrained.cc @@ -40,9 +40,9 @@ test01() std::iota(vref.begin(), vref.end(), 0); std::vector<int> v1(vref), v2(vref); test_container<int, random_access_iterator_wrapper> c - = {&v1[0], &v1[0] + size}; + = {v1.data(), v1.data() + size}; test_range<int, random_access_iterator_wrapper> r - = {&v2[0], &v2[0] + size}; + = {v2.data(), v2.data() + size}; std::ranlux48_base g1(size), g2(size + 1); ranges::shuffle(c, g1); diff --git a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/constrained.cc index 6b586f885dd..519c41f2bde 100644 --- a/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/partial_sort_copy/constrained.cc @@ -49,15 +49,15 @@ test01() for (unsigned middle = 0; middle < 10; ++middle) { test_container<int, forward_iterator_wrapper> c - = {&v1[0], &v1[0] + size}; + = {v1.data(), v1.data() + size}; test_range<int, input_iterator_wrapper> r - = {&v2[0], &v2[0] + size}; + = {v2.data(), v2.data() + size}; std::vector<int> o1(middle), o2(middle); test_range<int, random_access_iterator_wrapper> w1 - = {&o1[0], &o1[0]+middle}; + = {o1.data(), o1.data()+middle}; test_range<int, random_access_iterator_wrapper> w2 - = {&o2[0], &o2[0]+middle}; + = {o2.data(), o2.data()+middle}; auto [in1, out1] = ranges::partial_sort_copy(c.begin(), c.end(), w1.begin(), w1.end(), diff --git a/libstdc++-v3/testsuite/25_algorithms/shuffle/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/shuffle/constrained.cc index b96343aecce..3f976005b37 100644 --- a/libstdc++-v3/testsuite/25_algorithms/shuffle/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/shuffle/constrained.cc @@ -42,9 +42,9 @@ test01() std::iota(vref.begin(), vref.end(), 0); std::vector<int> v1(vref), v2(vref); test_container<int, random_access_iterator_wrapper> c - = {&v1[0], &v1[0] + size}; + = {v1.data(), v1.data() + size}; test_range<int, random_access_iterator_wrapper> r - = {&v2[0], &v2[0] + size}; + = {v2.data(), v2.data() + size}; std::ranlux48_base g1(size), g2(size + 1); VERIFY( ranges::shuffle(c, g1) == c.end() ); diff --git a/libstdc++-v3/testsuite/25_algorithms/sort/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/sort/constrained.cc index d8227773ccb..b5a99b73cc3 100644 --- a/libstdc++-v3/testsuite/25_algorithms/sort/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/sort/constrained.cc @@ -40,9 +40,9 @@ test01() std::iota(vref.begin(), vref.end(), 0); std::vector<int> v1(vref), v2(vref); test_container<int, random_access_iterator_wrapper> c - = {&v1[0], &v1[0] + size}; + = {v1.data(), v1.data() + size}; test_range<int, random_access_iterator_wrapper> r - = {&v2[0], &v2[0] + size}; + = {v2.data(), v2.data() + size}; std::ranlux48_base g1(size), g2(size + 1); ranges::shuffle(c, g1); diff --git a/libstdc++-v3/testsuite/25_algorithms/stable_sort/constrained.cc b/libstdc++-v3/testsuite/25_algorithms/stable_sort/constrained.cc index 23a8c03b519..ef02ccaae45 100644 --- a/libstdc++-v3/testsuite/25_algorithms/stable_sort/constrained.cc +++ b/libstdc++-v3/testsuite/25_algorithms/stable_sort/constrained.cc @@ -44,9 +44,9 @@ test01() std::iota(vref.begin(), vref.end(), 0); std::vector<int> v1(vref), v2(vref); test_container<int, random_access_iterator_wrapper> c - = {&v1[0], &v1[0] + size}; + = {v1.data(), v1.data() + size}; test_range<int, random_access_iterator_wrapper> r - = {&v2[0], &v2[0] + size}; + = {v2.data(), v2.data() + size}; std::ranlux48_base g1(size), g2(size + 1); ranges::shuffle(c, g1);

libstdc++: -D_GLIBCXX_DEBUG fixes in the constrained algos tests

Commit Message

Comments

Patch