Skip to content

[libc++] Fix implementation of iota_view::size #67819

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
merged 1 commit into from
Oct 4, 2023
Merged

[libc++] Fix implementation of iota_view::size #67819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions libcxx/include/__ranges/iota_view.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,15 +363,14 @@ namespace ranges {
(integral<_Start> && integral<_BoundSentinel>) || sized_sentinel_for<_BoundSentinel, _Start>
{
if constexpr (__integer_like<_Start> && __integer_like<_BoundSentinel>) {
if (__value_ < 0) {
if (__bound_sentinel_ < 0) {
return std::__to_unsigned_like(-__value_) - std::__to_unsigned_like(-__bound_sentinel_);
}
return std::__to_unsigned_like(__bound_sentinel_) + std::__to_unsigned_like(-__value_);
}
return std::__to_unsigned_like(__bound_sentinel_) - std::__to_unsigned_like(__value_);
return (__value_ < 0)
? ((__bound_sentinel_ < 0)
? std::__to_unsigned_like(-__value_) - std::__to_unsigned_like(-__bound_sentinel_)
: std::__to_unsigned_like(__bound_sentinel_) + std::__to_unsigned_like(-__value_))
: std::__to_unsigned_like(__bound_sentinel_) - std::__to_unsigned_like(__value_);
} else {
return std::__to_unsigned_like(__bound_sentinel_ - __value_);
}
return std::__to_unsigned_like(__bound_sentinel_ - __value_);
}
};

Expand Down
12 changes: 11 additions & 1 deletion libcxx/test/std/ranges/range.factories/range.iota.view/size.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@

// constexpr auto size() const requires see below;

#include <ranges>
#include <cassert>
#include <concepts>
#include <limits>
#include <ranges>

#include "test_macros.h"
#include "types.h"
Expand Down Expand Up @@ -89,6 +90,15 @@ constexpr bool test() {
assert(io.size() == 0);
}

// Make sure iota_view<short, short> works properly. For details,
// see https://github.com/llvm/llvm-project/issues/67551.
{
static_assert(std::ranges::sized_range<std::ranges::iota_view<short, short>>);
std::ranges::iota_view<short, short> io(10, 20);
std::same_as<unsigned int> auto sz = io.size();
assert(sz == 10);
}

return true;
}

Expand Down