From patchwork Sat Feb 18 20:48:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinka Ranns X-Patchwork-Id: 729460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vQhpL2sQ4z9s7k for ; Sun, 19 Feb 2017 07:49:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="UtblfHy4"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; q=dns; s=default; b=k2cnPm9inH2dSgH DVZqXyYePWubkcIfmGG6XRHXX/0kVMIDGlT6ETTx5tThZGQAbSalOOJGVB1F/mEn w2/1eDBR+l9bxtg6hLu9Ng8arwS9BQrKHlGydkwioYhYRcL7aK31fmv1HuAPWBa6 XnZ4FACKJovGbkVMQIsZWrstJA1o= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; s=default; bh=LPmkd2QabUInBIE58rrFB VINFhU=; b=UtblfHy4hIgrH6dSeAJtw/6X5tMFgSUIc/t2U84k2zuSfkS9hsCHv wyM0PyODnqi55GrJHWsd3+qvYzz1vs16BdY1YAE+Pi/HpS1loa4cb6jfyzdhTuw4 hCCumLvPGZbNS2xU8jM+Vu+uGj7TxFrcK3R4e+7RP70WyD6Ot4Nlh4= Received: (qmail 98018 invoked by alias); 18 Feb 2017 20:49:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 97989 invoked by uid 89); 18 Feb 2017 20:49:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=chrono X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-it0-f68.google.com Received: from mail-it0-f68.google.com (HELO mail-it0-f68.google.com) (209.85.214.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 18 Feb 2017 20:49:00 +0000 Received: by mail-it0-f68.google.com with SMTP id w185so979398ita.3; Sat, 18 Feb 2017 12:49:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=RiRSj9rgtPJ2W3xrNMrMZKI2oP9orwaYFzlg0SCxey0=; b=R/aTyWvj+knipyFh7NES2gpzJDdVPbuxnlZ7znBRbDQPdiAXgdlq/BQxWN5loKDNZM MspwNtDET8cpjgPF4R8YbPrFomWmW/iC78NDROZ2/eCQrx9yKIqlE2va1g2bhf9b8R3o CtU60lWTAYl2q+wPRuUrW/qA4vcLQjwSErRnMLqqZd44brZiEXluA/fWSwZgR0f7f6su Z5Di7weKSdQAPHv8R5ny7tJGd1nW5BPMvNvfoIUbawUPLWO2l3Nl3T7GL7/m815GKZ1T YYrUT6ugx0Dcw+PF7CvIEMUA6w9UDHakzI29/xgTKozHLXwA/iucmvr5gjUECPWtc0VK mtSg== X-Gm-Message-State: AMke39mKiu8z+ck8ADEQnNUJkvAlg+cDw7/PSq8RSZVQVshPUFTTiLxdJ830H8js10h8k3sCYKUhn96Y7lcjaQ== X-Received: by 10.36.170.79 with SMTP id y15mr13473201iti.46.1487450938724; Sat, 18 Feb 2017 12:48:58 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.169.95 with HTTP; Sat, 18 Feb 2017 12:48:58 -0800 (PST) In-Reply-To: <20170215093505.GB4602@redhat.com> References: <20170215093505.GB4602@redhat.com> From: Dinka Ranns Date: Sat, 18 Feb 2017 20:48:58 +0000 Message-ID: Subject: Re: [v3 PATCH] Implement C++17 GB50 resolution To: Jonathan Wakely Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Comments addressed. Please find the new diff attached to this e-mail. Changelog after review comments : 2017-02-18 Dinka Ranns C++17 GB50 resolution * include/std/chrono: (duration::operator++()): Add _GLIBCXX17_CONSTEXPR. (duration::operator++(int)): Likewise (duration::operator--()): Likewise (duration::operator--(int)): Likewise (duration::operator+=(const duration&)): Likewise (duration::operator-=(const duration&)): Likewise (duration::operator*=(const rep&)): Likewise (duration::operator/=(const rep&)): Likewise (duration::operator%=(const rep&)): Likewise (duration::operator%=(const duration&)): Likewise (time_point::operator+=(const duration&)): Likewise (time_point::operator-=(const duration&)): Likewise * testsuite/20_util/duration/arithmetic/constexpr_c++17.cc: new tests * testsuite/20_util/time_point/arithmetic/constexpr.cc: new tests On 15 February 2017 at 09:35, Jonathan Wakely wrote: > Hi, Dinka, thanks for the patch. > > On 14/02/17 21:22 +0000, Dinka Ranns wrote: >> >> diff --git a/libstdc++-v3/include/std/chrono >> b/libstdc++-v3/include/std/chrono >> index ceae7f8..6a6995c 100644 >> --- a/libstdc++-v3/include/std/chrono >> +++ b/libstdc++-v3/include/std/chrono >> @@ -349,50 +349,50 @@ _GLIBCXX_END_NAMESPACE_VERSION >> operator-() const >> { return duration(-__r); } >> >> - duration& >> + constexpr duration& > > > This needs to use _GLIBCXX17_CONSTEXPR instead of 'constexpr' > > These functions aren't constexpr in C++11 and C++14, and the standard > (annoyingly) forbids us from adding constexpr anywhere it isn't > present in the standard. > > The macro _GLIBCXX17_CONSTEXPR expands to 'constexpr' if __cplusplus > > 201402L, and expands to nothing otherwise. > > Each new 'constexpr' you've added needs to use that macro. > >> diff --git >> a/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr.cc >> b/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr.cc >> index 285f941..1128a52 100644 >> --- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr.cc >> +++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr.cc >> @@ -19,11 +19,31 @@ >> >> #include >> #include > > > There should be a blank line before and after this function, however > ... > >> +constexpr auto test_operators() >> +{ >> + std::chrono::nanoseconds d1 { }; >> + d1++; > > > This new function uses C++14 return type deduction, so will fail if > the test is run in C++11 mode (the default is C++14, but it can be > overridden on the command-line). > >> + ++d1; >> + d1--; >> + --d1; > > > Also once you change the new 'constexpr' specifiers to use the > _GLIBCXX17_CONSTEXPR macro this test will fail in C++14 mode. I think > this new function needs to be moved to a new test file, such as > testsuite/20_util/duration/arithmetic/constexpr_c++17.cc > > That should contain just your new test_operators() function, because > the rest of the class will be tested by the existing constexpr.cc test > file. So something like: > > // { dg-options "-std=gnu++17" } > // { dg-do compile { target c++1z } } > > // Copyright etc. etc. > // ... > > #include > > constexpr auto test_operators() > { > // ... > } > > constexpr auto d4 = test_operators(); > > > Note that the "dg-do compile" line should use the c++1z target instead > of c++11, and needs to override the default dialect with a dg-options > line. > > This test doesn't need a "main" function because it's a "dg-do > compile" test, so isn't linked. (The existing test that you modified > didn't need one either, but it doesn't do any harm leaving it there). > > >> diff --git >> a/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc >> b/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc >> new file mode 100644 >> index 0000000..e87a226 >> --- /dev/null >> +++ b/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc >> @@ -0,0 +1,39 @@ >> +// { dg-do compile { target c++11 } } > > > Since the time_point member functions will only be constexpr in C++17 > this test also needs to use c++1z instead of c++11, and needs to > override the default C++14 dialect, i.e. > > // { dg-options "-std=gnu++17" } > // { dg-do compile { target c++1z } } > diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 2c33be0..d05eaaf 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -349,50 +349,50 @@ _GLIBCXX_END_NAMESPACE_VERSION operator-() const { return duration(-__r); } - duration& + _GLIBCXX17_CONSTEXPR duration& operator++() { ++__r; return *this; } - duration + _GLIBCXX17_CONSTEXPR duration operator++(int) { return duration(__r++); } - duration& + _GLIBCXX17_CONSTEXPR duration& operator--() { --__r; return *this; } - duration + _GLIBCXX17_CONSTEXPR duration operator--(int) { return duration(__r--); } - duration& + _GLIBCXX17_CONSTEXPR duration& operator+=(const duration& __d) { __r += __d.count(); return *this; } - duration& + _GLIBCXX17_CONSTEXPR duration& operator-=(const duration& __d) { __r -= __d.count(); return *this; } - duration& + _GLIBCXX17_CONSTEXPR duration& operator*=(const rep& __rhs) { __r *= __rhs; return *this; } - duration& + _GLIBCXX17_CONSTEXPR duration& operator/=(const rep& __rhs) { __r /= __rhs; @@ -401,7 +401,7 @@ _GLIBCXX_END_NAMESPACE_VERSION // DR 934. template - typename enable_if::value, + _GLIBCXX17_CONSTEXPR typename enable_if::value, duration&>::type operator%=(const rep& __rhs) { @@ -410,7 +410,7 @@ _GLIBCXX_END_NAMESPACE_VERSION } template - typename enable_if::value, + _GLIBCXX17_CONSTEXPR typename enable_if::value, duration&>::type operator%=(const duration& __d) { @@ -631,14 +631,14 @@ _GLIBCXX_END_NAMESPACE_VERSION { return __d; } // arithmetic - time_point& + _GLIBCXX17_CONSTEXPR time_point& operator+=(const duration& __dur) { __d += __dur; return *this; } - time_point& + _GLIBCXX17_CONSTEXPR time_point& operator-=(const duration& __dur) { __d -= __dur; diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc b/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc new file mode 100644 index 0000000..2721765 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/constexpr_c++17.cc @@ -0,0 +1,45 @@ +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++1z } } + +// Copyright (C) 2011-2017 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +constexpr auto test_operators() +{ + std::chrono::nanoseconds d1 { 1 }; + d1++; + ++d1; + d1--; + --d1; + + auto d2(d1); + + d1+=d2; + d1-=d2; + + d1*=1; + d1/=1; + d1%=1; + d1%=d2; + + return d1; +} + +constexpr auto d4 = test_operators(); + diff --git a/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc b/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc new file mode 100644 index 0000000..2f2aceb --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/time_point/arithmetic/constexpr.cc @@ -0,0 +1,36 @@ +// { dg-options "-std=gnu++17" } +// { dg-do compile { target c++1z } } + +// Copyright (C) 2011-2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include +constexpr auto test_operators() +{ + using namespace std::chrono; + nanoseconds d1 { }; + time_point c1 { }; + + c1+=d1; + c1-=d1; + + + return 11; +} + +constexpr auto a = test_operators();