From patchwork Fri Feb 2 10:25:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 195781 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:9bc1:b0:106:209c:c626 with SMTP id op1csp332344dyc; Fri, 2 Feb 2024 02:27:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUxKB+VgfmbCh3oylzItKjlBmhmeJSbz5aUfa6HiDatSLsK1AxPa3qZSGUDJU/bdN+0ZVq X-Received: by 2002:a67:c796:0:b0:468:6b0:ef95 with SMTP id t22-20020a67c796000000b0046806b0ef95mr6796912vsk.24.1706869666136; Fri, 02 Feb 2024 02:27:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706869666; cv=pass; d=google.com; s=arc-20160816; b=kHrq/N4VbFcbnJv9A87/mL6amsX2y0Us3d0PHEiVV/Zc206kZZbBcsJqbAhHj4LZS7 q75KtQx3ERTq4a5bjIgTCrIqKI48Do59juhcKi61Rdo6/zDxBYKBoD7aBSV8t4cAURhj uEotbId0bTVhlSHCQS7MbtnelcTLigDUHCdUQcFALtvI91Me4m6HGH1FiGAUh7p1zps7 u8bb1wdUcgiXF37LFxLKyWXbotwz31Ge2AE5hW4xO9W6rW+0T2NQTtLkb6GSvBSvIpi6 d7oEyAhbarcyLCMsmoHjSVFq3D3QngXtvCLpJtiUOeC+tmmq2XrICdAjNCrcSLFgTBw/ jdBg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=NXjikNHHOfTRwzk36yCwuZAIRcdWulQ3OtdwqfUpfks=; fh=m29t9/j8ixOtYeQ0+Jl0+Mg8QgvU8f7maYoFYZVFwiA=; b=P/08tcLbscO4WKm0lQ54BEhLEH139yYcv6MKyyW5NNK+HspUJyC5VCxTQC9LOXbhfN ql9KxLcaW0VvQmkmkTbe2Go1c6ozVksLY/sLHDHI2BPzykneWll5KmDktsbunVdh4L8d kiyagpRou4s6BA6KBk2uLzDWz9Z2WmxkJt15+yGEsAJV/3RvS8t3/WXGj/DVxXqnpnoW W/Idw6pZnLv2kYMrjPASR+htxhZT6Qrj9Dn4LoKGauDbp6RtK0rO5EZHogJdirX9xM4t g700vnURvI9k4j0XBi3CokpmRgwWHjn4ek0tuvXzoR/DuRbVk6bAF8PEJg1elP0XMa2i 6hzA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LKvu+LQM; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=1; AJvYcCWIZWtZNYI9iifaB+kqaIdlhbDbyQbuaCQUbxYUEVcprglw87eBx5d7NDyEVdHc2YHGjYVPkcDbXJB1GeZoprpnqzLp1Q== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d4-20020a37c404000000b0078554450a4dsi1182955qki.101.2024.02.02.02.27.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 02:27:46 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LKvu+LQM; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD5D43857B8B for ; Fri, 2 Feb 2024 10:27:45 +0000 (GMT) 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 AF2C238582AF for ; Fri, 2 Feb 2024 10:25:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF2C238582AF Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AF2C238582AF Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706869537; cv=none; b=PgFiqLzq2Q4ml3hH8zc/wc76dsD+u2Sc6zbpOXi26Fptm8chvSG8N40/G7fuh3HfJNCa7ALk3HfXyJapJxXNdUrOX2K2rXecpru+c2lVjDWaN0/7F7FxP5i662M/XyARuFf5xhW2YaE7PK+/tqfZFukIFC0l0USumH7/BouYGl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706869537; c=relaxed/simple; bh=cEcT4pVkmOMvYsq1S1ETFzf5+1sCXZUt4AApSwOKRFo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=M0c0ytH1Bl7AEnhig9+XPn1slHNz4poxGApwWFqZJOZGhXFEN/908nk7Bi7aVz/A8ib9S9Hi2rK4bQ6LdAwgNDX1hMH65etD2Vg1+efd3RDCAzpPeYgxiWee/ifrnPpGWlJxKe46d+iJ3motzTs3nbOL4PtIm7Od1VefZ49WBdI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706869534; 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=NXjikNHHOfTRwzk36yCwuZAIRcdWulQ3OtdwqfUpfks=; b=LKvu+LQMkv76YlZf9kAtC3JuX7kzlLhM4OA0C97xX4dhpJA5nbLYep8+H6vN3OVu2lPazw bGB5rhjVhUJgiOW1qTb8klEUNrZWC6zNqC2AzsG4qG9DS/FNRjAdfSCvKxRjyvQU/Zaagn S6LoR4Y4k419+pDHUXeK6WhHj++Nh1c= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-327-8Q0W-mEbNreD90r0S40azw-1; Fri, 02 Feb 2024 05:25:32 -0500 X-MC-Unique: 8Q0W-mEbNreD90r0S40azw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F20B280BC87; Fri, 2 Feb 2024 10:25:32 +0000 (UTC) Received: from localhost (unknown [10.42.28.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CC7E40C9444; Fri, 2 Feb 2024 10:25:32 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Allow explicit conversion of string views with different traits Date: Fri, 2 Feb 2024 10:25:04 +0000 Message-ID: <20240202102512.2239941-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.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, T_SCC_BODY_TEXT_LINE, URIBL_SBL_A autolearn=ham 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789782566803278907 X-GMAIL-MSGID: 1789782566803278907 Tested aarch64-linux. Pushed to trunk. -- >8 -- This was changed by LWG 3857. libstdc++-v3/ChangeLog: * include/std/string_view (basic_string_view(R&&)): Remove constraint that traits_type must be the same, as per LWG 3857. * testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc: Explicit conversion between different specializations should be allowed. * testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc: Likewise. --- libstdc++-v3/include/std/string_view | 2 -- .../cons/char/range_c++20.cc | 21 ++++--------------- .../cons/wchar_t/range_c++20.cc | 21 ++++--------------- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view index b444b5b9a39..e30a9c1768e 100644 --- a/libstdc++-v3/include/std/string_view +++ b/libstdc++-v3/include/std/string_view @@ -167,8 +167,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION && (!requires (_DRange& __d) { __d.operator ::std::basic_string_view<_CharT, _Traits>(); }) - && (!requires { typename _DRange::traits_type; } - || is_same_v) constexpr explicit basic_string_view(_Range&& __r) noexcept(noexcept(ranges::size(__r)) && noexcept(ranges::data(__r))) diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc index 5d0396563fd..bae8da1d264 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/char/range_c++20.cc @@ -115,23 +115,10 @@ test02() static_assert( ! std::is_constructible_v ); using V2 = std::basic_string_view>; - // V2::traits_type is not the right type - static_assert( ! std::is_constructible_v ); - - struct V3 : V2 - { - private: - using V2::traits_type; - }; - // V3::traits_type is not a valid (accessible) type - static_assert( std::is_constructible_v ); - - struct V4 : V2 - { - using traits_type = std::string_view::traits_type; - }; - // V4::traits_type is the right type - static_assert( std::is_constructible_v ); + // LWG 3857 + // basic_string_view should allow explicit conversion when only traits vary + static_assert( std::is_constructible_v ); + static_assert( ! std::is_convertible_v ); } void diff --git a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc index d6996a1dd6f..3cf154d8602 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string_view/cons/wchar_t/range_c++20.cc @@ -115,23 +115,10 @@ test02() static_assert( ! std::is_constructible_v ); using V2 = std::basic_string_view>; - // V2::traits_type is not the right type - static_assert( ! std::is_constructible_v ); - - struct V3 : V2 - { - private: - using V2::traits_type; - }; - // V3::traits_type is not a valid (accessible) type - static_assert( std::is_constructible_v ); - - struct V4 : V2 - { - using traits_type = std::wstring_view::traits_type; - }; - // V4::traits_type is the right type - static_assert( std::is_constructible_v ); + // LWG 3857 + // basic_string_view should allow explicit conversion when only traits vary + static_assert( std::is_constructible_v ); + static_assert( ! std::is_convertible_v ); } void