From patchwork Mon Dec 12 14:01:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 32405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2260876wrr; Mon, 12 Dec 2022 06:06:58 -0800 (PST) X-Google-Smtp-Source: AA0mqf6cKbV4RaZe0OVnQDBwSCU5SHM4G6iTgkJ9qhjyFJY+B7Tz9+cxSbqBW7ABqWnMnDRS8sXd X-Received: by 2002:a17:907:595:b0:7c0:f4f8:582a with SMTP id vw21-20020a170907059500b007c0f4f8582amr11821977ejb.52.1670854018413; Mon, 12 Dec 2022 06:06:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670854018; cv=none; d=google.com; s=arc-20160816; b=zcIC78L/m63D0VuwwzkAMse5OCzrjxlSWR+OQJXEavDELniQqjN9WhC1Z8Gm1FdAco s3kjQu5Y4KdnJUG5AbXb2aTgRSDni06mY0H8vgUhojcHgEUbEkbqsK7epl0den7fSMeV y2rPnTa0O5Ns3pt7DjYYjYMYr2cr5Bw7AagsKh/c3g5c8JMILSxyUBRaatR8KBFm119r RlbOwSV5+yPmkXKHVjuK8EoKFTICOHBzZK4JpXlbyqLgYjrlIgeDYUf5IWCpeApd6OuP MvkC7tPssEgHmy7XwBbykKUCgRBDFqYyAiG5FqfuqHt/Xm3q/pY3fLwPbPt5j/eSDRxM 59SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=X8WdKc0M2TftfLvdQq4DAastFfvJm2E8RKYbleW6U2M=; b=QQJKSw8OIb4Aww1MrIjakIKtQTpp4kEPkwl3F4p4HRG7XS7dET3EaEfnx/hMA3Xh1g //kZZXsUU96aHS8BUh2MCmf76Zl2mPr94sSUb28IWqAzyQodpwBd2IrNvXolNz/yGKgj R81WDSuzrXNrADRlUnPyHeRT9mWfnQSXO2zf0XXpW2LCsWZ3TSFtYB+gilrpoY0AnoPh t5Us+0bUSbiFNC8ZwAf6hVElwgcPm94Zu4JIsr+yXe7N+f/5xvwsEu+cVUIuT3gM1hM+ GTYRvHk7TQiEvyMQAPvGutLmG7V2RKONua0XcvG58uCM/Dxi71i244X7VcVoYRULh78z 6cXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WQ8CQawG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id i17-20020a1709064fd100b007c173f57c88si1845468ejw.811.2022.12.12.06.06.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 06:06:58 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WQ8CQawG; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EA0293848E1F for ; Mon, 12 Dec 2022 14:04:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA0293848E1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670853884; bh=X8WdKc0M2TftfLvdQq4DAastFfvJm2E8RKYbleW6U2M=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WQ8CQawGbkh4CgcP8cRiPCMtRbasdrrZTX4JT1l9WEP1yft/HjMbr6E/R/IorXJNN J5d7xIHs8PBBbU6nI+p636le1E+hdjJfsQeVZm8pkx0U3qP4yeI9PS/KNSfdgS9NYV 7b4yWTWWpb9qJRfdY8BBbd6Aqk2BbTmS41cUKaes= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 2AC9338475AE for ; Mon, 12 Dec 2022 14:01:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2AC9338475AE Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-213-tRmj5LnGPD2DERzOV0MNiA-1; Mon, 12 Dec 2022 09:01:45 -0500 X-MC-Unique: tRmj5LnGPD2DERzOV0MNiA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7DCA3C0F673; Mon, 12 Dec 2022 14:01:42 +0000 (UTC) Received: from localhost (unknown [10.33.36.251]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E3A240C2005; Mon, 12 Dec 2022 14:01:42 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix constraint on std::basic_format_string [PR108024] Date: Mon, 12 Dec 2022 14:01:39 +0000 Message-Id: <20221212140139.716962-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 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_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752017422978040960?= X-GMAIL-MSGID: =?utf-8?q?1752017422978040960?= Tested x86_64-linux. Pushed to trunk. -- >8-- Also remove some redundant std::move calls for return statements. libstdc++-v3/ChangeLog: PR libstdc++/108024 * include/std/format (basic_format_string): Fix constraint. * testsuite/std/format/format_string.cc: New test. --- libstdc++-v3/include/std/format | 10 ++++++---- .../testsuite/std/format/format_string.cc | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/std/format/format_string.cc diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 269f8f6cc6a..9c928371415 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -110,7 +110,8 @@ namespace __format template struct basic_format_string { - template> _Tp> + template + requires convertible_to> consteval basic_format_string(const _Tp& __s); @@ -609,7 +610,7 @@ namespace __format else for (_CharT __c : __str) *__out++ = __c; - return std::move(__out); + return __out; } // Write STR to OUT with NFILL copies of FILL_CHAR specified by ALIGN. @@ -664,7 +665,7 @@ namespace __format __out = __format::__write(std::move(__out), __str); __pad(__r, __out); - return std::move(__out); + return __out; } // A lightweight optional. @@ -3626,7 +3627,8 @@ namespace __format /// @endcond template - template> _Tp> + template + requires convertible_to> consteval basic_format_string<_CharT, _Args...>:: basic_format_string(const _Tp& __s) diff --git a/libstdc++-v3/testsuite/std/format/format_string.cc b/libstdc++-v3/testsuite/std/format/format_string.cc new file mode 100644 index 00000000000..1dd6ca8f125 --- /dev/null +++ b/libstdc++-v3/testsuite/std/format/format_string.cc @@ -0,0 +1,16 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include + +struct Str +{ + consteval operator std::string_view() const { return ""; } + operator std::string_view() = delete; +}; + +// PR libstdc++/108024 +static_assert( std::is_constructible_v, const Str&> ); +static_assert( std::is_convertible_v> ); + +constinit std::format_string<> s = Str();