public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4404] libstdc++: Fix brainwrong in path::_S_convert(T) [PR102743] Date: Thu, 14 Oct 2021 14:12:53 +0000 (GMT) [thread overview] Message-ID: <20211014141253.81E943858026@sourceware.org> (raw) https://gcc.gnu.org/g:5e3f88838994b67580594c4679c839fff7cdeba0 commit r12-4404-g5e3f88838994b67580594c4679c839fff7cdeba0 Author: Jonathan Wakely <jwakely@redhat.com> Date: Thu Oct 14 13:20:57 2021 +0100 libstdc++: Fix brainwrong in path::_S_convert(T) [PR102743] This function was supposed to check whether the parameter's value type is the same as path::value_type, and therefore needs no conversion. Instead it checks whether the parameter is the same as its own value type, which is never true. This means we incorrectly return a string view for the case where T is path::string_type, instead of just returning the string itself. The only place that happens is path::_S_convert_loc for Windows, where we call _S_convert with a std::wstring rvalue. This fixes the condition in _S_convert(T). libstdc++-v3/ChangeLog: PR libstdc++/102743 * include/bits/fs_path.h (path::_S_convert(T)): Fix condition for returning the same string unchanged. Diff: --- libstdc++-v3/include/bits/fs_path.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index c51bfa3095a..a63e4b9ab07 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -625,7 +625,7 @@ namespace __detail static auto _S_convert(_Tp __str) { - if constexpr (is_same_v<_Tp, typename _Tp::value_type>) + if constexpr (is_same_v<typename _Tp::value_type, value_type>) return __str; // No conversion needed. #if !defined _GLIBCXX_FILESYSTEM_IS_WINDOWS && defined _GLIBCXX_USE_CHAR8_T else if constexpr (is_same_v<_Tp, std::u8string>)
reply other threads:[~2021-10-14 14:12 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211014141253.81E943858026@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).