From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4A7B4383235E; Tue, 6 Dec 2022 21:40:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A7B4383235E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670362836; bh=BV96KtmRv+d5VxnIc3v2kxW/ZYuppmnTuWXqj5jNRgs=; h=From:To:Subject:Date:From; b=H18wKGst2x15MHH0H+yAMkOGZ2GCx+zWifHfg6a0511xHNWI4QhyjowNgtfpf3Chw yUJj2jrXWTCriSKbKYPbOaHTQ1+JqKJX9R9Bi3kHfQw4adb4jKqcmtWlZDrEtLXfOA gWfMTzHknC/T6w3KX4iLrwk9hM+jazLUEBDY5DrQ= 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 r13-4527] libstdc++: Add casts for integer-like difference type [PR107871] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 5329e1a8e1480d536ff96283a6556e51112ba470 X-Git-Newrev: 9cce91a63dcc40cb39e68f6a771e891e51c51946 Message-Id: <20221206214036.4A7B4383235E@sourceware.org> Date: Tue, 6 Dec 2022 21:40:36 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9cce91a63dcc40cb39e68f6a771e891e51c51946 commit r13-4527-g9cce91a63dcc40cb39e68f6a771e891e51c51946 Author: Jonathan Wakely Date: Mon Dec 5 21:38:53 2022 +0000 libstdc++: Add casts for integer-like difference type [PR107871] libstdc++-v3/ChangeLog: PR libstdc++/107871 * include/std/format (_Iter_sink::_M_overflow): Add cast to size_t. (_Iter_sink::_M_make_span): Use typedef instead of decltype. * testsuite/std/format/functions/107871.cc: New test. Diff: --- libstdc++-v3/include/std/format | 8 ++++---- libstdc++-v3/testsuite/std/format/functions/107871.cc | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 6d6a770eb8c..1072e2c17db 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -2481,12 +2481,12 @@ namespace __format auto __s = this->_M_used(); if (_M_max < 0) // No maximum. _M_out = ranges::copy(__s, std::move(_M_out)).out; - else if (_M_count < size_t(_M_max)) + else if (_M_count < static_cast(_M_max)) { auto __max = _M_max - _M_count; span<_CharT> __first; if (__max < __s.size()) - __first = __s.first(__max); + __first = __s.first(static_cast(__max)); else __first = __s; _M_out = ranges::copy(__first, std::move(_M_out)).out; @@ -2564,11 +2564,11 @@ namespace __format if (__n > 0) { - if constexpr (!is_integral_v + if constexpr (!is_integral_v> || sizeof(__n) > sizeof(size_t)) { // __int128 or __detail::__max_diff_type - auto __m = (decltype(__n))(size_t)-1; + auto __m = iter_difference_t<_OutIter>((size_t)-1); if (__n > __m) __n = __m; } diff --git a/libstdc++-v3/testsuite/std/format/functions/107871.cc b/libstdc++-v3/testsuite/std/format/functions/107871.cc new file mode 100644 index 00000000000..1fb558e7ac6 --- /dev/null +++ b/libstdc++-v3/testsuite/std/format/functions/107871.cc @@ -0,0 +1,14 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include + +struct O { + using difference_type = std::ranges::__detail::__max_diff_type; + O& operator=(const char&); + O& operator*(); + O& operator++(); + O& operator++(int); +}; + +auto str = std::format_to_n(O{}, 4, "{}", " "); // PR libstdc++/107871