Skip to content

[libcxx][test] Do not assume array::iterator is a pointer #100603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
strega-nil merged 6 commits into from
Jul 30, 2024
Merged

[libcxx][test] Do not assume array::iterator is a pointer #100603

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d08c22c
[libcxx] Do not assume array::iterator is a pointer
strega-nil Jul 25, 2024
04a67b5
make sure to include <memory>
strega-nil Jul 25, 2024
92fda36
fix array<T, 0>::iterator under ABI_USE_WRAP_ITER
strega-nil Jul 26, 2024
135531e
CRs - remove array changes
strega-nil Jul 27, 2024
ed1bc6d
format
strega-nil Jul 27, 2024
19d4819
switch a note to a TODO
strega-nil Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <algorithm>
#include <array>
#include <cassert>
#include <memory>
#include <ranges>
#include <vector>

Expand Down Expand Up @@ -61,7 +62,8 @@ template <class It, class Sent = It>
constexpr void test_iterators() {
using ValueT = std::iter_value_t<It>;
auto make_range = [](auto& a) {
return std::ranges::subrange(It(std::ranges::begin(a)), Sent(It(std::ranges::end(a))));
return std::ranges::subrange(
It(std::to_address(std::ranges::begin(a))), Sent(It(std::to_address(std::ranges::end(a)))));
};
{ // simple test
{
Expand Down Expand Up @@ -91,7 +93,7 @@ constexpr void test_iterators() {
std::array<ValueT, 0> a = {};

auto ret = std::ranges::find_last(make_range(a), 1).begin();
assert(ret == It(a.begin()));
assert(ret == It(a.data()));
}
}

Expand Down
4 changes: 3 additions & 1 deletion libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last_if.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <algorithm>
#include <array>
#include <cassert>
#include <memory>
#include <ranges>

#include "almost_satisfies_types.h"
Expand Down Expand Up @@ -59,7 +60,8 @@ static_assert(!HasFindLastIfR<ForwardRangeNotSentinelEqualityComparableWith>);

template <class It, class Sent>
constexpr auto make_range(auto& a) {
return std::ranges::subrange(It(std::ranges::begin(a)), Sent(It(std::ranges::end(a))));
return std::ranges::subrange(
It(std::to_address(std::ranges::begin(a))), Sent(It(std::to_address(std::ranges::end(a)))));
}

template <template <class> class IteratorT, template <class> class SentinelT>
Expand Down
6 changes: 4 additions & 2 deletions libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last_if_not.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <algorithm>
#include <array>
#include <cassert>
#include <memory>
#include <ranges>

#include "almost_satisfies_types.h"
Expand Down Expand Up @@ -59,7 +60,8 @@ static_assert(!HasFindLastIfR<ForwardRangeNotSentinelEqualityComparableWith>);

template <class It, class Sent>
constexpr auto make_range(auto& a) {
return std::ranges::subrange(It(std::ranges::begin(a)), Sent(It(std::ranges::end(a))));
return std::ranges::subrange(
It(std::to_address(std::ranges::begin(a))), Sent(It(std::to_address(std::ranges::end(a)))));
}

template <template <class> class IteratorT, template <class> class SentinelT>
Expand Down Expand Up @@ -99,7 +101,7 @@ constexpr void test_iterator_classes() {
std::array<int, 0> a = {};

auto ret = std::ranges::find_last_if_not(make_range<it, sent>(a), [](auto&&) { return false; }).begin();
assert(ret == it(a.begin()));
assert(ret == it(a.data()));
}
}

Expand Down