From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4F0FF3858D35; Thu, 5 Jan 2023 00:51:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4F0FF3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1672879911; bh=XhxXI+6CG9+YF77Z40BBhI+MlVZFmEnLWNZ8PvZhh0E=; h=From:To:Subject:Date:From; b=tHl56ixNaz7rTXcUO6GK4dxmbhPS2m3Q6wWTY0aITOEiBwxsFOJGuOvdDY5fKSsyU G3v9ayqU9DXlvWKsZaYiAzY/ipXdzL4VqXmpImjlGf/W1p5EFfmYi+pqktp6MeMd+w rh1drX4ocDTHoO2UcKTSkiY3dHyRLugF5eZ+7fxo= 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-5002] libstdc++: Fix std::chrono::hh_mm_ss with unsigned rep [PR108265] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: faccda276841adb687b624276f781ea147c65445 X-Git-Newrev: e36e57b032b2d70eaa1294d5921e4fd8ce12a74d Message-Id: <20230105005151.4F0FF3858D35@sourceware.org> Date: Thu, 5 Jan 2023 00:51:51 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e36e57b032b2d70eaa1294d5921e4fd8ce12a74d commit r13-5002-ge36e57b032b2d70eaa1294d5921e4fd8ce12a74d Author: Jonathan Wakely Date: Wed Jan 4 16:43:51 2023 +0000 libstdc++: Fix std::chrono::hh_mm_ss with unsigned rep [PR108265] libstdc++-v3/ChangeLog: PR libstdc++/108265 * include/std/chrono (hh_mm_ss): Do not use chrono::abs if duration rep is unsigned. * testsuite/std/time/hh_mm_ss/1.cc: Check unsigned rep. Diff: --- libstdc++-v3/include/std/chrono | 15 ++++++++++++--- libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 27f391a1455..e7fd6ed57ab 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -2294,7 +2294,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } constexpr - hh_mm_ss(_Duration __d, bool __is_neg) noexcept + hh_mm_ss(_Duration __d, bool __is_neg) : _M_h (duration_cast(__d)), _M_m (duration_cast(__d - hours())), _M_s (duration_cast(__d - hours() - minutes())), @@ -2307,6 +2307,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_ss._M_r = duration_cast(__ss).count(); } + static constexpr _Duration + _S_abs(_Duration __d) + { + if constexpr (numeric_limits::is_signed) + return chrono::abs(__d); + else + return __d; + } + public: static constexpr unsigned fractional_width = {_S_fractional_width()}; @@ -2318,8 +2327,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr hh_mm_ss() noexcept = default; constexpr explicit - hh_mm_ss(_Duration __d) noexcept - : hh_mm_ss(chrono::abs(__d), __d < _Duration::zero()) + hh_mm_ss(_Duration __d) + : hh_mm_ss(_S_abs(__d), __d < _Duration::zero()) { } constexpr bool diff --git a/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc b/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc index 3f8a838c477..3c61145317c 100644 --- a/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc +++ b/libstdc++-v3/testsuite/std/time/hh_mm_ss/1.cc @@ -115,3 +115,19 @@ size() struct S4 { long long h; char m, s; bool neg; double ss; }; static_assert(sizeof(hh_mm_ss>) == sizeof(S4)); } + +constexpr void +unsigned_rep() +{ + using namespace std::chrono; + + constexpr duration ms(3690001); + + constexpr hh_mm_ss hms(ms); // PR libstdc++/108265 + static_assert( ! hms.is_negative() ); + static_assert( hms.to_duration() == milliseconds(ms.count()) ); + static_assert( hms.hours() == 1h ); + static_assert( hms.minutes() == 1min ); + static_assert( hms.seconds() == 30s ); + static_assert( hms.subseconds() == 1ms ); +}