para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unnecessary check from size_bytes() (#1105)

Browse Source 
`size_bytes()` returns the span's size in bytes. 
Assuming the span was constructed with an accurate size parameter, the check `size() < dynamic_extent / sizeof(element_type)` isn't required, since `size_t(-1)` (which is `dynamic_extent`) represents the size of the address space, so the number of bytes will never exceed it and in practice won't even come close.
Otherwise, it is not actually feasible to detect cases when the size parameter does not correspond to the dimensions of the underlying data pointer. In these cases, the relationship `size() < dynamic_extent / sizeof(element_type)` is simply one of many ways in which the `size()` could be incorrect, and serves no necessary purpose.

Resolves #1012
This commit is contained in:
Dmitry Kobets 2023-05-09 09:05:26 -07:00 committed by GitHub
parent 1d036585cc
commit 9face82309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gsl/span
View File

@ -624,11 +624,7 @@ public:
// [span.obs], span observers // [span.obs], span observers
constexpr size_type size() const noexcept { return storage_.size(); } constexpr size_type size() const noexcept { return storage_.size(); }
constexpr size_type size_bytes() const noexcept constexpr size_type size_bytes() const noexcept { return size() * sizeof(element_type); }
{
Expects(size() < dynamic_extent / sizeof(element_type));
return size() * sizeof(element_type);
}
constexpr bool empty() const noexcept { return size() == 0; } constexpr bool empty() const noexcept { return size() == 0; }

12
tests/span_tests.cpp
View File

@ -1116,12 +1116,6 @@ TEST(span_test, rbegin_rend)
TEST(span_test, as_bytes) TEST(span_test, as_bytes)
{ {
const auto terminateHandler = std::set_terminate([] {
std::cerr << "Expected Death. as_bytes";
std::abort();
});
const auto expected = GetExpectedDeathString(terminateHandler);
int a[] = {1, 2, 3, 4}; int a[] = {1, 2, 3, 4};
{ {
const span<const int> s = a; const span<const int> s = a;
@ -1147,12 +1141,6 @@ TEST(span_test, as_bytes)
EXPECT_TRUE(static_cast<const void*>(bs.data()) == static_cast<const void*>(s.data())); EXPECT_TRUE(static_cast<const void*>(bs.data()) == static_cast<const void*>(s.data()));
EXPECT_TRUE(bs.size() == s.size_bytes()); EXPECT_TRUE(bs.size() == s.size_bytes());
} }
int b[5] = {1, 2, 3, 4, 5};
{
span<int> sp(std::begin(b), static_cast<size_t>(-2));
EXPECT_DEATH((void) sp.size_bytes(), expected);
}
} }
TEST(span_test, as_writable_bytes) TEST(span_test, as_writable_bytes)