From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 2D8313858D20; Wed, 12 Jul 2023 20:23:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D8313858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689193405; bh=hHqd8UpEcSKV1Yz4Dj80YIikBm6Bu41TplMra8M/LK8=; h=From:To:Subject:Date:From; b=yqewCi07NqCkENMj8xuvgd+ZeVFXh3PCLZuvw5IKMLObC3eG0jsEmVrPqPJpmBvLW Vh4s10CP3Ajs5vnwIz55jPH9HYfv79QKiwzZOwoxNph4kaw/sNyZkjOXRRkHZTT+ck tTk95Hz2goPClO7svlgILkmhzh+Vq7yKyoIYygfE= 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 r11-10906] libstdc++: Check conversion from filesystem::path to wide strings [PR95048] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 13cfe6b2969de2981e8de60585ba204fbf9ce459 X-Git-Newrev: 470f32f964574febf484edaf9e580067ac97f3b6 Message-Id: <20230712202325.2D8313858D20@sourceware.org> Date: Wed, 12 Jul 2023 20:23:25 +0000 (GMT) List-Id: https://gcc.gnu.org/g:470f32f964574febf484edaf9e580067ac97f3b6 commit r11-10906-g470f32f964574febf484edaf9e580067ac97f3b6 Author: Jonathan Wakely Date: Wed Jul 12 14:40:19 2023 +0100 libstdc++: Check conversion from filesystem::path to wide strings [PR95048] The testcase added for this bug only checks conversion from wide strings on construction, but the fix also covered conversion to wide strings via path::wstring(). Add checks for that, and u16string() and u32string(). libstdc++-v3/ChangeLog: PR libstdc++/95048 * testsuite/27_io/filesystem/path/construct/95048.cc: Check conversions to wide strings. * testsuite/experimental/filesystem/path/construct/95048.cc: Likewise. (cherry picked from commit d6384ad1a9ab7ea46990a7ed1299d5a2be4acece) Diff: --- libstdc++-v3/testsuite/27_io/filesystem/path/construct/95048.cc | 6 ++++++ .../testsuite/experimental/filesystem/path/construct/95048.cc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/construct/95048.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/construct/95048.cc index c1a382d1420..cd80d668b23 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/construct/95048.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/construct/95048.cc @@ -16,6 +16,8 @@ test_wide() VERIFY( CHECK(L, "\U0001F4C1") ); // folder VERIFY( CHECK(L, "\U0001F4C2") ); // open folder VERIFY( CHECK(L, "\U0001F4C4") ); // filing cabient + + VERIFY( path(u8"\U0001D11E").wstring() == L"\U0001D11E" ); // G Clef } void @@ -25,6 +27,8 @@ test_u16() VERIFY( CHECK(u, "\U0001F4C1") ); // folder VERIFY( CHECK(u, "\U0001F4C2") ); // open folder VERIFY( CHECK(u, "\U0001F4C4") ); // filing cabient + + VERIFY( path(u8"\U0001D11E").u16string() == u"\U0001D11E" ); // G Clef } void @@ -34,6 +38,8 @@ test_u32() VERIFY( CHECK(U, "\U0001F4C1") ); // folder VERIFY( CHECK(U, "\U0001F4C2") ); // open folder VERIFY( CHECK(U, "\U0001F4C4") ); // filing cabient + + VERIFY( path(u8"\U0001D11E").u32string() == U"\U0001D11E" ); // G Clef } int diff --git a/libstdc++-v3/testsuite/experimental/filesystem/path/construct/95048.cc b/libstdc++-v3/testsuite/experimental/filesystem/path/construct/95048.cc index b7a93f3c985..fc65bfecd4d 100644 --- a/libstdc++-v3/testsuite/experimental/filesystem/path/construct/95048.cc +++ b/libstdc++-v3/testsuite/experimental/filesystem/path/construct/95048.cc @@ -18,6 +18,8 @@ test_wide() VERIFY( CHECK(L, "\U0001F4C1") ); // folder VERIFY( CHECK(L, "\U0001F4C2") ); // open folder VERIFY( CHECK(L, "\U0001F4C4") ); // filing cabient + + VERIFY( path(u8"\U0001D11E").wstring() == L"\U0001D11E" ); // G Clef } void @@ -27,6 +29,8 @@ test_u16() VERIFY( CHECK(u, "\U0001F4C1") ); // folder VERIFY( CHECK(u, "\U0001F4C2") ); // open folder VERIFY( CHECK(u, "\U0001F4C4") ); // filing cabient + + VERIFY( path(u8"\U0001D11E").u16string() == u"\U0001D11E" ); // G Clef } void @@ -36,6 +40,8 @@ test_u32() VERIFY( CHECK(U, "\U0001F4C1") ); // folder VERIFY( CHECK(U, "\U0001F4C2") ); // open folder VERIFY( CHECK(U, "\U0001F4C4") ); // filing cabient + + VERIFY( path(u8"\U0001D11E").u32string() == U"\U0001D11E" ); // G Clef } int