This is an archive of the discontinued LLVM Phabricator instance.

Differential D148030

[libc++] Remove redundant assertion in std::span::subspan
ClosedPublic

Authored by ldionne on Apr 11 2023, 9:56 AM.

Details

Reviewers
EricWF
Group Reviewers
Restricted Project
Commits
rG3865e084b2ef: [libc++] Remove redundant assertion in std::span::subspan
Summary

That is already checked later in the function as __count <= size() - __offset.

rdar://107884996

Diff Detail

Event Timeline

ldionne created this revision.Apr 11 2023, 9:56 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 11 2023, 9:56 AM
ldionne requested review of this revision.Apr 11 2023, 9:56 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 11 2023, 9:56 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
EricWF accepted this revision.Apr 11 2023, 11:02 AM
This revision is now accepted and ready to land.Apr 11 2023, 11:02 AM
Harbormaster completed remote builds in B224813: Diff 512504.Apr 11 2023, 1:22 PM
ldionne added a comment.Apr 14 2023, 8:20 AM

Failures are the unrelated sanitizer issues, shipping.

This revision was landed with ongoing or failed builds.Apr 14 2023, 8:20 AM
Closed by commit rG3865e084b2ef: [libc++] Remove redundant assertion in std::span::subspan (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG3865e084b2ef: [libc++] Remove redundant assertion in std::span::subspan.

Revision Contents

PathSize
libcxx/
include/
2 lines
test/
libcxx/
containers/
views/
views.span/
span.sub/
4 lines

Diff 512504

libcxx/include/span

Show First 20 Lines • Show All 321 Lines • ▼ Show 20 Lines// ~span() noexcept = default;
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
constexpr span<element_type, dynamic_extent> constexpr span<element_type, dynamic_extent>
subspan(size_type __offset, size_type __count = dynamic_extent) const noexcept subspan(size_type __offset, size_type __count = dynamic_extent) const noexcept
{ {
_LIBCPP_ASSERT(__offset <= size(), "span<T, N>::subspan(offset, count): offset out of range"); _LIBCPP_ASSERT(__offset <= size(), "span<T, N>::subspan(offset, count): offset out of range");
_LIBCPP_ASSERT(__count <= size() || __count == dynamic_extent, "span<T, N>::subspan(offset, count): count out of range");
if (__count == dynamic_extent) if (__count == dynamic_extent)
return {data() + __offset, size() - __offset}; return {data() + __offset, size() - __offset};
_LIBCPP_ASSERT(__count <= size() - __offset, "span<T, N>::subspan(offset, count): offset + count out of range"); _LIBCPP_ASSERT(__count <= size() - __offset, "span<T, N>::subspan(offset, count): offset + count out of range");
return {data() + __offset, __count}; return {data() + __offset, __count};
} }
_LIBCPP_INLINE_VISIBILITY constexpr size_type size() const noexcept { return _Extent; } _LIBCPP_INLINE_VISIBILITY constexpr size_type size() const noexcept { return _Extent; }
_LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes() const noexcept { return _Extent * sizeof(element_type); } _LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes() const noexcept { return _Extent * sizeof(element_type); }
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Lines constexpr span<element_type, _Count> subspan() const noexcept
return span<element_type, _Count>{data() + _Offset, _Count == dynamic_extent ? size() - _Offset : _Count}; return span<element_type, _Count>{data() + _Offset, _Count == dynamic_extent ? size() - _Offset : _Count};
} }
constexpr span<element_type, dynamic_extent> constexpr span<element_type, dynamic_extent>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
subspan(size_type __offset, size_type __count = dynamic_extent) const noexcept subspan(size_type __offset, size_type __count = dynamic_extent) const noexcept
{ {
_LIBCPP_ASSERT(__offset <= size(), "span<T>::subspan(offset, count): offset out of range"); _LIBCPP_ASSERT(__offset <= size(), "span<T>::subspan(offset, count): offset out of range");
_LIBCPP_ASSERT(__count <= size() || __count == dynamic_extent, "span<T>::subspan(offset, count): count out of range");
if (__count == dynamic_extent) if (__count == dynamic_extent)
return {data() + __offset, size() - __offset}; return {data() + __offset, size() - __offset};
_LIBCPP_ASSERT(__count <= size() - __offset, "span<T>::subspan(offset, count): offset + count out of range"); _LIBCPP_ASSERT(__count <= size() - __offset, "span<T>::subspan(offset, count): offset + count out of range");
return {data() + __offset, __count}; return {data() + __offset, __count};
} }
_LIBCPP_INLINE_VISIBILITY constexpr size_type size() const noexcept { return __size_; } _LIBCPP_INLINE_VISIBILITY constexpr size_type size() const noexcept { return __size_; }
_LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes() const noexcept { return __size_ * sizeof(element_type); } _LIBCPP_INLINE_VISIBILITY constexpr size_type size_bytes() const noexcept { return __size_ * sizeof(element_type); }
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines

libcxx/test/libcxx/containers/views/views.span/span.sub/assert.subspan.pass.cpp

Show All 32 Lines
int main(int, char**) { int main(int, char**) {
{ {
std::array<int, 3> array{0, 1, 2}; std::array<int, 3> array{0, 1, 2};
std::span<int> const s(array.data(), array.size()); std::span<int> const s(array.data(), array.size());
TEST_LIBCPP_ASSERT_FAILURE(s.subspan(4), "span<T>::subspan(offset, count): offset out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan(4), "span<T>::subspan(offset, count): offset out of range");
TEST_LIBCPP_ASSERT_FAILURE(s.subspan<4>(), "span<T>::subspan<Offset, Count>(): Offset out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan<4>(), "span<T>::subspan<Offset, Count>(): Offset out of range");
TEST_LIBCPP_ASSERT_FAILURE(s.subspan(0, 4), "span<T>::subspan(offset, count): count out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan(0, 4), "span<T>::subspan(offset, count): offset + count out of range");
TEST_LIBCPP_ASSERT_FAILURE((s.subspan<0, 4>()), "span<T>::subspan<Offset, Count>(): Offset + Count out of range"); TEST_LIBCPP_ASSERT_FAILURE((s.subspan<0, 4>()), "span<T>::subspan<Offset, Count>(): Offset + Count out of range");
TEST_LIBCPP_ASSERT_FAILURE(s.subspan(1, 3), "span<T>::subspan(offset, count): offset + count out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan(1, 3), "span<T>::subspan(offset, count): offset + count out of range");
TEST_LIBCPP_ASSERT_FAILURE((s.subspan<1, 3>()), "span<T>::subspan<Offset, Count>(): Offset + Count out of range"); TEST_LIBCPP_ASSERT_FAILURE((s.subspan<1, 3>()), "span<T>::subspan<Offset, Count>(): Offset + Count out of range");
} }
{ {
std::array<int, 3> array{0, 1, 2}; std::array<int, 3> array{0, 1, 2};
std::span<int, 3> const s(array.data(), array.size()); std::span<int, 3> const s(array.data(), array.size());
TEST_LIBCPP_ASSERT_FAILURE(s.subspan(4), "span<T, N>::subspan(offset, count): offset out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan(4), "span<T, N>::subspan(offset, count): offset out of range");
// s.subspan<4>() caught at compile-time (tested in libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp) // s.subspan<4>() caught at compile-time (tested in libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp)
TEST_LIBCPP_ASSERT_FAILURE(s.subspan(0, 4), "span<T, N>::subspan(offset, count): count out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan(0, 4), "span<T, N>::subspan(offset, count): offset + count out of range");
// s.subspan<0, 4>() caught at compile-time (tested in libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp) // s.subspan<0, 4>() caught at compile-time (tested in libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp)
TEST_LIBCPP_ASSERT_FAILURE(s.subspan(1, 3), "span<T, N>::subspan(offset, count): offset + count out of range"); TEST_LIBCPP_ASSERT_FAILURE(s.subspan(1, 3), "span<T, N>::subspan(offset, count): offset + count out of range");
// s.subspan<1, 3>() caught at compile-time (tested in libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp) // s.subspan<1, 3>() caught at compile-time (tested in libcxx/test/std/containers/views/views.span/span.sub/subspan.verify.cpp)
} }
return 0; return 0;
} }