diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-06-05 11:42:01 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-06-05 11:44:51 +0100 |
| commit | 96963713f6a648a0ed890450e02ebdd8ff583b14 (patch) | |
| tree | 5b301d0b430d70509a90a03aa3870027346d3482 | |
| parent | f31729d794c4150f6cba97f33ec125e180abd7dd (diff) | |
| download | gcc-96963713f6a648a0ed890450e02ebdd8ff583b14.zip gcc-96963713f6a648a0ed890450e02ebdd8ff583b14.tar.gz gcc-96963713f6a648a0ed890450e02ebdd8ff583b14.tar.bz2 | |
libstdc++: Fix return type of ranges::ssize for 128-bit integer [PR 100824]
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
PR libstdc++/100824
* include/bits/ranges_base.h (_SSize): Return signed type.
* testsuite/std/ranges/access/ssize.cc: Check with __int128.
| -rw-r--r-- | libstdc++-v3/include/bits/ranges_base.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/ranges/access/ssize.cc | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h index e3c3962..728d3ad 100644 --- a/libstdc++-v3/include/bits/ranges_base.h +++ b/libstdc++-v3/include/bits/ranges_base.h @@ -447,7 +447,7 @@ namespace ranges #if defined __STRICT_ANSI__ && defined __SIZEOF_INT128__ // For strict-ansi modes integral<__int128> is false else if constexpr (__detail::__is_int128<__size_type>) - return static_cast<unsigned __int128>(__size); + return static_cast<__int128>(__size); #endif else // Must be one of __max_diff_type or __max_size_type. return __detail::__max_diff_type(__size); diff --git a/libstdc++-v3/testsuite/std/ranges/access/ssize.cc b/libstdc++-v3/testsuite/std/ranges/access/ssize.cc index f53f462..fdbf245 100644 --- a/libstdc++-v3/testsuite/std/ranges/access/ssize.cc +++ b/libstdc++-v3/testsuite/std/ranges/access/ssize.cc @@ -85,6 +85,20 @@ test06() VERIFY( s == 4 ); } +void +test07() +{ +#ifdef __SIZEOF_INT128__ + struct R + { + unsigned __int128 size() const { return 4; } + }; + R r; + static_assert( std::same_as<decltype(std::ranges::ssize(r)), __int128> ); + VERIFY( std::ranges::ssize(r) == 4 ); +#endif +} + int main() { @@ -93,4 +107,5 @@ main() test04(); test05(); test06(); + test07(); } |