public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-8758] libstdc++: Fix noexcept-specifier for ranges::empty
@ 2021-07-15 19:53 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2021-07-15 19:53 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:ee22bc201ebedb210af2a300177ab84fe339b092
commit r11-8758-gee22bc201ebedb210af2a300177ab84fe339b092
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Mon Jun 14 22:42:05 2021 +0100
libstdc++: Fix noexcept-specifier for ranges::empty
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* include/bits/ranges_base.h (ranges::empty): Check whether
conversion to bool can throw.
* testsuite/std/ranges/access/empty.cc: Check for correct
noexcept-specifier.
(cherry picked from commit f9598d89a9f5a327ecdfa6f6978a0cfbe4447111)
Diff:
---
libstdc++-v3/include/bits/ranges_base.h | 2 +-
libstdc++-v3/testsuite/std/ranges/access/empty.cc | 31 +++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h
index 728d3ad2b25..3bc657ca17e 100644
--- a/libstdc++-v3/include/bits/ranges_base.h
+++ b/libstdc++-v3/include/bits/ranges_base.h
@@ -476,7 +476,7 @@ namespace ranges
_S_noexcept()
{
if constexpr (__member_empty<_Tp>)
- return noexcept(std::declval<_Tp&>().empty());
+ return noexcept(bool(std::declval<_Tp&>().empty()));
else if constexpr (__size0_empty<_Tp>)
return noexcept(_Size{}(std::declval<_Tp&>()) == 0);
else
diff --git a/libstdc++-v3/testsuite/std/ranges/access/empty.cc b/libstdc++-v3/testsuite/std/ranges/access/empty.cc
index 9044dd155da..b2d8b105325 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/empty.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/empty.cc
@@ -89,10 +89,41 @@ test03()
static_assert( std::ranges::empty(R2{}) );
}
+void
+test04()
+{
+ struct E1
+ {
+ bool empty() const noexcept { return {}; }
+ };
+
+ static_assert( noexcept(std::ranges::empty(E1{})) );
+
+ struct E2
+ {
+ bool empty() const noexcept(false) { return {}; }
+ };
+
+ static_assert( ! noexcept(std::ranges::empty(E2{})) );
+
+ struct E3
+ {
+ struct B
+ {
+ explicit operator bool() const noexcept(false) { return true; }
+ };
+
+ B empty() const noexcept { return {}; }
+ };
+
+ static_assert( ! noexcept(std::ranges::empty(E3{})) );
+}
+
int
main()
{
test01();
test02();
test03();
+ test04();
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-15 19:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-15 19:53 [gcc r11-8758] libstdc++: Fix noexcept-specifier for ranges::empty Jonathan Wakely
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).