From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A5C2A3858D37; Sat, 23 Mar 2024 11:09:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5C2A3858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1711192160; bh=HmMx5ZBdDAL68ZhFwU0liHNBxUWDxz5JzIj1HmFBbjw=; h=From:To:Subject:Date:From; b=hcN/wRm8x/O9AxwSlQkETaHdoI0Sl4T2h4+BM+bOJEPSuFeZPHurxIJL1QHAUt2Gj 88aawCS9iXjqMUTx+ArcLvezNOVYzwlMJnXQAGiQPSzRuiaiPQCGguUTZ0S8462Zn8 mtBmUticScXSewrFlXgDSuXEIzbyZdf3x1y0eSAY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-9644] libstdc++: Disable std::formatter specializations (LWG 3944) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 3763fb8970d7515a4a3be2152604140965303031 X-Git-Newrev: 543585046d17add37c0108b06d2884d0e03cedde Message-Id: <20240323110920.A5C2A3858D37@sourceware.org> Date: Sat, 23 Mar 2024 11:09:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:543585046d17add37c0108b06d2884d0e03cedde commit r14-9644-g543585046d17add37c0108b06d2884d0e03cedde Author: Jonathan Wakely Date: Thu Mar 21 11:15:06 2024 +0000 libstdc++: Disable std::formatter specializations (LWG 3944) This was just approved in Tokyo as a DR for C++23. It doesn't affect us yet, because we don't implement the __cpp_lib_format_ranges features. We can add the disabled specializations and add a testcase now though. libstdc++-v3/ChangeLog: * include/std/format (formatter): Disable specializations that would allow sequences of narrow characters to be formatted as wchar_t without conversion, as per LWG 3944. * testsuite/std/format/formatter/lwg3944.cc: New test. Diff: --- libstdc++-v3/include/std/format | 23 ++++++++++++++++ .../testsuite/std/format/formatter/lwg3944.cc | 31 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 613016d1a10..22dcb5f24bd 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -2478,6 +2478,29 @@ namespace __format }; /// @} +#if defined _GLIBCXX_USE_WCHAR_T && __cpp_lib_format_ranges + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3944. Formatters converting sequences of char to sequences of wchar_t + + namespace __format { struct __disabled; } + + // std::formatter<__disabled, C> uses the primary template, which is disabled. + template<> + struct formatter + : private formatter<__format::__disabled, wchar_t> { }; + template<> + struct formatter + : private formatter<__format::__disabled, wchar_t> { }; + template + struct formatter + : private formatter<__format::__disabled, wchar_t> { }; + template + struct formatter, wchar_t> + : private formatter<__format::__disabled, wchar_t> { }; + template + struct formatter, wchar_t> + : private formatter<__format::__disabled, wchar_t> { }; +#endif /// @cond undocumented namespace __format diff --git a/libstdc++-v3/testsuite/std/format/formatter/lwg3944.cc b/libstdc++-v3/testsuite/std/format/formatter/lwg3944.cc new file mode 100644 index 00000000000..ff5f075bcc8 --- /dev/null +++ b/libstdc++-v3/testsuite/std/format/formatter/lwg3944.cc @@ -0,0 +1,31 @@ +// { dg-do compile { target c++20 } } +// { dg-options "-Wno-unused-result" } + +// LWG 3944. Formatters converting sequences of char to sequences of wchar_t + +#include + +void test_lwg3944() +{ + // Ill-formed in C++20 and C++23 + const char* cstr = "hello"; + char* str = const_cast(cstr); + std::format(L"{}", str); // { dg-error "here" } + std::format(L"{}",cstr); // { dg-error "here" } + + // Ill-formed in C++20 + // In C++23 they give L"['h', 'e', 'l', 'l', 'o']" + std::format(L"{}", "hello"); // { dg-error "here" } + std::format(L"{}", std::string_view("hello")); // { dg-error "here" } + std::format(L"{}", std::string("hello")); // { dg-error "here" } +#ifdef __cpp_lib_format_ranges + // LWG 3944 does not change this, it's still valid. + std::format(L"{}", std::vector{'h', 'e', 'l', 'l', 'o'}); +#endif +} + +// { dg-error "std::formatter must be specialized" "" { target *-*-* } 0 } +// { dg-prune-output "use of deleted function" } +// { dg-prune-output "no matching function" } +// { dg-prune-output "has no member named 'parse'" } +// { dg-prune-output "not a constant expression" }