From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 77C9A39ADC34; Fri, 11 Jun 2021 22:25:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 77C9A39ADC34 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-8558] libstdc++: Fix return type of ranges::ssize for 128-bit integer [PR 100824] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 1112f1226a27cd772aec7e50514a121c5c04bdb7 X-Git-Newrev: 2ba1680d3e9f3bb99783519a08eed6435f131045 Message-Id: <20210611222552.77C9A39ADC34@sourceware.org> Date: Fri, 11 Jun 2021 22:25:52 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2021 22:25:52 -0000 https://gcc.gnu.org/g:2ba1680d3e9f3bb99783519a08eed6435f131045 commit r11-8558-g2ba1680d3e9f3bb99783519a08eed6435f131045 Author: Jonathan Wakely Date: Sat Jun 5 11:42:01 2021 +0100 libstdc++: Fix return type of ranges::ssize for 128-bit integer [PR 100824] Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/100824 * include/bits/ranges_base.h (_SSize): Return signed type. * testsuite/std/ranges/access/ssize.cc: Check with __int128. (cherry picked from commit 96963713f6a648a0ed890450e02ebdd8ff583b14) Diff: --- libstdc++-v3/include/bits/ranges_base.h | 2 +- libstdc++-v3/testsuite/std/ranges/access/ssize.cc | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h index e3c3962bcd9..728d3ad2b25 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(__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 f53f462580c..fdbf245d036 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 ); + VERIFY( std::ranges::ssize(r) == 4 ); +#endif +} + int main() { @@ -93,4 +107,5 @@ main() test04(); test05(); test06(); + test07(); }