public inbox for libstdc++-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-8927] libstdc++: Add workaround for fs::path constraint recursion [PR106201] Date: Tue, 22 Nov 2022 21:49:04 +0000 (GMT) [thread overview] Message-ID: <20221122214904.74D9D3858C1F@sourceware.org> (raw) https://gcc.gnu.org/g:477b3f9d58589b3af7a5a7d038d78352ad66406e commit r12-8927-g477b3f9d58589b3af7a5a7d038d78352ad66406e Author: Jonathan Wakely <jwakely@redhat.com> Date: Tue Nov 22 18:15:56 2022 +0000 libstdc++: Add workaround for fs::path constraint recursion [PR106201] This works around a compiler bug where overload resolution attempts implicit conversion to path in order to call a function with a path& parameter. Such conversion would produce a prvalue, which would not be able to bind to the lvalue reference anyway. Attempting to check the conversion causes a constraint recursion because the arguments to the path constructor are checked to see if they're iterators, which checks if they're swappable, which tries to use the swap function that triggered the conversion in the first place. This replaces the swap function with an abbreviated function template that is constrained with same_as<path> auto& so that the invalid conversion is never considered. libstdc++-v3/ChangeLog: PR libstdc++/106201 * include/bits/fs_path.h (filesystem::swap(path&, path&)): Replace with abbreviated function template. * include/experimental/bits/fs_path.h (filesystem::swap): Likewise. * testsuite/27_io/filesystem/iterators/106201.cc: New test. * testsuite/experimental/filesystem/iterators/106201.cc: New test. Diff: --- libstdc++-v3/include/bits/fs_path.h | 7 +++++++ libstdc++-v3/include/experimental/bits/fs_path.h | 9 ++++++++- .../testsuite/27_io/filesystem/iterators/106201.cc | 14 ++++++++++++++ .../testsuite/experimental/filesystem/iterators/106201.cc | 14 ++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index 65682c2a185..1b4a1b69f37 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -737,7 +737,14 @@ namespace __detail /// @{ /// @relates std::filesystem::path +#if __cpp_concepts >= 201907L + // Workaround for PR libstdc++/106201 + inline void + swap(same_as<path> auto& __lhs, same_as<path> auto& __rhs) noexcept + { __lhs.swap(__rhs); } +#else inline void swap(path& __lhs, path& __rhs) noexcept { __lhs.swap(__rhs); } +#endif size_t hash_value(const path& __p) noexcept; diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index a493e17a37e..ba6acb2158d 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -537,7 +537,14 @@ namespace __detail /// @relates std::experimental::filesystem::path @{ /// Swap overload for paths - inline void swap(path& __lhs, path& __rhs) noexcept { __lhs.swap(__rhs); } +#if __cpp_concepts >= 201907L + // Workaround for PR libstdc++/106201 + inline void + swap(same_as<path> auto& __lhs, same_as<path> auto& __rhs) noexcept + { __lhs.swap(__rhs); } +#else + inline void swap(path& __lhs, path& __rhs) noexcept { __lhs.swap(__rhs); } +#endif /// Compute a hash value for a path size_t hash_value(const path& __p) noexcept; diff --git a/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc new file mode 100644 index 00000000000..c5fefd9ac3f --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/filesystem/iterators/106201.cc @@ -0,0 +1,14 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } +// { dg-require-filesystem-ts "" } + +// PR libstdc++/106201 constraint recursion in path(Source const&) constructor. + +#include <filesystem> +#include <iterator> +#include <concepts> +namespace fs = std::filesystem; +using I = std::counted_iterator<fs::directory_iterator>; +static_assert( std::swappable<I> ); +using R = std::counted_iterator<fs::recursive_directory_iterator>; +static_assert( std::swappable<R> ); diff --git a/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc new file mode 100644 index 00000000000..017b72ef5f6 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/filesystem/iterators/106201.cc @@ -0,0 +1,14 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } +// { dg-require-filesystem-ts "" } + +// PR libstdc++/106201 constraint recursion in path(Source const&) constructor. + +#include <experimental/filesystem> +#include <iterator> +#include <concepts> +namespace fs = std::experimental::filesystem; +using I = std::counted_iterator<fs::directory_iterator>; +static_assert( std::swappable<I> ); +using R = std::counted_iterator<fs::recursive_directory_iterator>; +static_assert( std::swappable<R> );
reply other threads:[~2022-11-22 21:49 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=20221122214904.74D9D3858C1F@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).