From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 616BD3853D6E; Mon, 28 Nov 2022 16:57:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 616BD3853D6E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669654669; bh=kb1LhpSS7RIKg/R55YSb5r0C70q3haCE4+8bGhLZQnA=; h=From:To:Subject:Date:From; b=uugQmmbMFgjjToReqISaq76tQAyxtxmABhAq+C4Hr5V0gbIJPL4zzWtKYzCacrFxz GMTVxGzggWjOiwny/OZqYMWWNiCaINSGAlYdcPix6dKWMk4qqIrSvX57mEz6d5WDel Wmzx43lqXBxS9iKY7seeLdJnFzQ61tKjTUAW2nXE= 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-4370] libstdc++: Fix std::string_view for I32LP16 targets X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 7b79fa930917da735f02b4f6911dfbb0a91f9714 X-Git-Newrev: a7b97a1f6b9d4993545525fd5cb334ae640ddf45 Message-Id: <20221128165749.616BD3853D6E@sourceware.org> Date: Mon, 28 Nov 2022 16:57:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a7b97a1f6b9d4993545525fd5cb334ae640ddf45 commit r13-4370-ga7b97a1f6b9d4993545525fd5cb334ae640ddf45 Author: Jonathan Wakely Date: Mon Nov 28 12:16:21 2022 +0000 libstdc++: Fix std::string_view for I32LP16 targets For H8/300 with -msx -mn -mint32 the type of (_M_len - __pos) is int, because int is wider than size_t so the operands are promoted. libstdc++-v3/ChangeLog: * include/std/string_view (basic_string_view::copy) Use explicit template argument for call to std::min. (basic_string_view::substr): Likewise. Diff: --- libstdc++-v3/include/std/string_view | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view index 2604af2e9aa..f42045dd6f1 100644 --- a/libstdc++-v3/include/std/string_view +++ b/libstdc++-v3/include/std/string_view @@ -315,7 +315,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { __glibcxx_requires_string_len(__str, __n); __pos = std::__sv_check(size(), __pos, "basic_string_view::copy"); - const size_type __rlen = std::min(__n, _M_len - __pos); + const size_type __rlen = std::min(__n, _M_len - __pos); // _GLIBCXX_RESOLVE_LIB_DEFECTS // 2777. basic_string_view::copy should use char_traits::copy traits_type::copy(__str, data() + __pos, __rlen); @@ -327,7 +327,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION substr(size_type __pos = 0, size_type __n = npos) const noexcept(false) { __pos = std::__sv_check(size(), __pos, "basic_string_view::substr"); - const size_type __rlen = std::min(__n, _M_len - __pos); + const size_type __rlen = std::min(__n, _M_len - __pos); return basic_string_view{_M_str + __pos, __rlen}; }