From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1725) id AF46D3950CB9; Fri, 28 Aug 2020 20:04:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF46D3950CB9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1598645095; bh=mGslcyPakA0WWg+GzyL8F+O3Mqmv61tI5xE2a/vNx90=; h=From:To:Subject:Date:From; b=fCJkMt/QZMeaKaM2qMh0Jboac9Oc3MNey7SkmRg//Qt6JeBsDPCayaXNy58WErBbl G9zqY2/sNci28RuxmWVfmSyeofFQfvblOYDfODnqsUvpRtDoMIOehkZ682FWgN92Bb qtU4twahtgTsqxzXxWhzcNpWFYNo5g72YUq2QWkM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: William Schmidt To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/wschmidt/heads/builtins3)] libstdc++: Fix arithmetic bug in chrono::year_month::operator+ X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/users/wschmidt/heads/builtins3 X-Git-Oldrev: 7b743c67f04471a0129390ad2808e61e5538e0d3 X-Git-Newrev: 71e9716137d47872f30f933ff99ba9ef3df1665c Message-Id: <20200828200455.AF46D3950CB9@sourceware.org> Date: Fri, 28 Aug 2020 20:04:55 +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, 28 Aug 2020 20:04:55 -0000 https://gcc.gnu.org/g:71e9716137d47872f30f933ff99ba9ef3df1665c commit 71e9716137d47872f30f933ff99ba9ef3df1665c Author: Patrick Palka Date: Thu Aug 27 14:11:24 2020 -0400 libstdc++: Fix arithmetic bug in chrono::year_month::operator+ This fixes the months-based addition for year_month when the year_month's month component is 0. libstdc++-v3/ChangeLog: * include/std/chrono (year_month::operator+): Properly handle a month value of 0 by casting the month value to int before subtracting 1 from it so that the difference is sign-extended in the subsequent addition. * testsuite/std/time/year_month/1.cc: Test adding months to a year_month whose month component is below or above the normalized range of [1,12]. Diff: --- libstdc++-v3/include/std/chrono | 2 +- libstdc++-v3/testsuite/std/time/year_month/1.cc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index df2f5d23f52..9fc8f560d99 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -2133,7 +2133,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // TODO: Optimize? auto __m = __ym.month() + __dm; - auto __i = unsigned{__ym.month()} - 1 + __dm.count(); + auto __i = int(unsigned(__ym.month())) - 1 + __dm.count(); auto __y = (__i < 0 ? __ym.year() + years{(__i - 11) / 12} : __ym.year() + years{__i / 12}); diff --git a/libstdc++-v3/testsuite/std/time/year_month/1.cc b/libstdc++-v3/testsuite/std/time/year_month/1.cc index 007cfeb2f72..4c331dcdb50 100644 --- a/libstdc++-v3/testsuite/std/time/year_month/1.cc +++ b/libstdc++-v3/testsuite/std/time/year_month/1.cc @@ -83,4 +83,16 @@ constexpr_year_month() static_assert(2017y/33 + months{0} == 2019y/9); static_assert(2010y/January + months{-12} == 2009y/January); + + static_assert(2010y/month{0} + months{-1} == 2009y/November); + static_assert(2010y/month{0} + months{0} == 2009y/December); + static_assert(2010y/month{0} + months{1} == 2010y/January); + static_assert(2010y/month{0} + months{2} == 2010y/February); + static_assert(2010y/month{0} + months{11} == 2010y/November); + static_assert(2010y/month{0} + months{12} == 2010y/December); + static_assert(2010y/month{0} + months{13} == 2011y/January); + + static_assert(months{-1} + 2010y/month{37} == 2012y/December); + static_assert(months{0} + 2010y/month{37} == 2013y/January); + static_assert(months{1} + 2010y/month{37} == 2013y/February); }