From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 0BDC53857C5A for ; Wed, 19 Jul 2023 15:52:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0BDC53857C5A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689781940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUCjcgzeA2QwTu0bTarRmcmKdYUHtrp3y7VGEOAD+tk=; b=P1swkSDfrmybMB2P+oNoLP6Gbbet0j1MS0iWIX/ri4h7vI0XtIa+kXsc7Xr++Xb36kEP87 w51mDISsiC9hRUBodXZ0eG8JOFBFU4/tPKuXYIalMi5Sp2Vd7itGjQuFeDBCv1zXlwbwZH HxxN+Der/Rg6qvH0Dl1UzMP8l6YJWMM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-605-D3ie5AbmMBS_uXPYn0mWxQ-1; Wed, 19 Jul 2023 11:52:17 -0400 X-MC-Unique: D3ie5AbmMBS_uXPYn0mWxQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF9638F184F; Wed, 19 Jul 2023 15:52:16 +0000 (UTC) Received: from localhost (unknown [10.42.28.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5EA74CD0FD; Wed, 19 Jul 2023 15:52:16 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix formatting of negative chrono::hh_mm_ss Date: Wed, 19 Jul 2023 16:52:12 +0100 Message-ID: <20230719155216.2545575-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux. Pushed to trunk. -- >8 -- When formatting with an empty chrono spec ("{}") two minus signs were being added to hh_mm_ss values. This is because the __is_neg flag was checked to add one explicitly, and then the ostream operator added another one. We should only check the __is_neg flag for durations, because those are the only types which are modified to be non-negative before calling _M_format. We don't change hh_mm_ss values to be negative, because that would require performing arithmetic on the hh_mm_ss members to sum them, and then again to construct a new hh_mm_ss object with the positive value. Instead, we can just be careful about using the __is_neg flag correctly. To fix the bug, _M_format_to_ostream no longer checks the __is_neg flag for non-durations, and _M_format doesn't set it for hh_mm_ss until after the call to _M_format_to_ostream. We can also avoid setting it for types that it doesn't apply to, by making the __print_sign lambda only inspect it for duration and hh_mm_ss types. libstdc++-v3/ChangeLog: * include/bits/chrono_io.h (__formatter_chrono::_M_format): Do not set __is_neg for hh_mm_ss before calling _M_format_to_ostream. Change __print_sign lambda to only check __is_neg for durations and hh_mm_ss types. (__formatter_chrono::_M_format_to_ostream): Only check __is_neg for duration types. * testsuite/std/time/hh_mm_ss/io.cc: Check negative values. --- libstdc++-v3/include/bits/chrono_io.h | 27 ++++++++++--------- .../testsuite/std/time/hh_mm_ss/io.cc | 4 +++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/include/bits/chrono_io.h b/libstdc++-v3/include/bits/chrono_io.h index 0c5f9f5058b..c95301361d8 100644 --- a/libstdc++-v3/include/bits/chrono_io.h +++ b/libstdc++-v3/include/bits/chrono_io.h @@ -486,11 +486,6 @@ namespace __format _M_format(const _Tp& __t, _FormatContext& __fc, bool __is_neg = false) const { - if constexpr (__is_specialization_of<_Tp, chrono::hh_mm_ss>) - __is_neg = __t.is_negative(); - else if constexpr (!chrono::__is_duration_v<_Tp>) - __is_neg = false; - auto __first = _M_spec._M_chrono_specs.begin(); const auto __last = _M_spec._M_chrono_specs.end(); if (__first == __last) @@ -513,12 +508,19 @@ namespace __format else __out = __sink.out(); + // formatter passes the correct value of __is_neg + // for durations but for hh_mm_ss we decide it here. + if constexpr (__is_specialization_of<_Tp, chrono::hh_mm_ss>) + __is_neg = __t.is_negative(); + auto __print_sign = [&__is_neg, &__out] { - if (__is_neg) - { - *__out++ = _S_plus_minus[1]; - __is_neg = false; - } + if constexpr (chrono::__is_duration_v<_Tp> + || __is_specialization_of<_Tp, chrono::hh_mm_ss>) + if (__is_neg) + { + *__out++ = _S_plus_minus[1]; + __is_neg = false; + } return std::move(__out); }; @@ -708,8 +710,9 @@ namespace __format __os << __t._M_date << ' ' << __t._M_time; else { - if (__is_neg) [[unlikely]] - __os << _S_plus_minus[1]; + if constexpr (chrono::__is_duration_v<_Tp>) + if (__is_neg) [[unlikely]] + __os << _S_plus_minus[1]; __os << __t; } diff --git a/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc b/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc index 072234328c7..ddb1ad77d1e 100644 --- a/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc +++ b/libstdc++-v3/testsuite/std/time/hh_mm_ss/io.cc @@ -47,9 +47,13 @@ test_format() auto s = std::format("{}", hh_mm_ss{1h + 23min + 45s}); VERIFY( s == "01:23:45" ); + s = std::format("{}", hh_mm_ss{-42min}); + VERIFY( s == "-00:42:00" ); auto ws = std::format(L"{}", hh_mm_ss{1h + 23min + 45s}); VERIFY( ws == L"01:23:45" ); + ws = std::format(L"{}", hh_mm_ss{-42min}); + VERIFY( ws == L"-00:42:00" ); // Locale-specific formats: auto loc = std::locale::classic(); -- 2.41.0