Tested x86_64-linux. Pushed to trunk. Probably good to backport. -- >8 --
This constructor should only ever be used with a literal 0 as the argument, so we can make it consteval. This has the nice advantage that it is expanded immediately in the front end, and so GDB will never step into the __cmp_cat::__unseq::__unseq(__unseq*) constructor that is uninteresting and probably confusing to users. libstdc++-v3/ChangeLog: * libsupc++/compare (__cmp_cat::__unseq): Make ctor consteval. * testsuite/18_support/comparisons/categories/zero_neg.cc: Prune excess errors caused by invalid consteval calls. --- libstdc++-v3/libsupc++/compare | 2 +- .../18_support/comparisons/categories/zero_neg.cc | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/libsupc++/compare b/libstdc++-v3/libsupc++/compare index b133fdbcf1e..9215f51e94b 100644 --- a/libstdc++-v3/libsupc++/compare +++ b/libstdc++-v3/libsupc++/compare @@ -53,7 +53,7 @@ namespace std _GLIBCXX_VISIBILITY(default) struct __unspec { - constexpr __unspec(__unspec*) noexcept { } + consteval __unspec(__unspec*) noexcept { } }; } diff --git a/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc b/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc index 7daf799f71d..17a129bcb75 100644 --- a/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc +++ b/libstdc++-v3/testsuite/18_support/comparisons/categories/zero_neg.cc @@ -34,6 +34,11 @@ test01() std::weak_ordering::equivalent == 1; // { dg-error "invalid conversion" } std::strong_ordering::equivalent == 1; // { dg-error "invalid conversion" } + constexpr int z = 0; + std::partial_ordering::equivalent == z; // { dg-error "invalid conversion" } + std::weak_ordering::equivalent == z; // { dg-error "invalid conversion" } + std::strong_ordering::equivalent == z; // { dg-error "invalid conversion" } + constexpr void* p = nullptr; std::partial_ordering::equivalent == p; // { dg-error "invalid conversion" } std::weak_ordering::equivalent == p; // { dg-error "invalid conversion" } @@ -44,3 +49,6 @@ test01() std::weak_ordering::equivalent == nullptr; std::strong_ordering::equivalent == nullptr; } + +// { dg-prune-output "reinterpret_cast.* is not a constant expression" } +// { dg-prune-output "cast from 'void.' is not allowed" } -- 2.41.0