From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 32023385840C; Tue, 26 Apr 2022 13:13:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32023385840C 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 r10-10577] libstdc++: Fix noexcept-specifier for ranges::empty X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: dcd1fc4900fd101f8fa22883b6ac31e6f7601373 X-Git-Newrev: 01c72ccad94e4f7b71504e502cba43d62b658143 Message-Id: <20220426131317.32023385840C@sourceware.org> Date: Tue, 26 Apr 2022 13:13:17 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 13:13:17 -0000 https://gcc.gnu.org/g:01c72ccad94e4f7b71504e502cba43d62b658143 commit r10-10577-g01c72ccad94e4f7b71504e502cba43d62b658143 Author: Jonathan Wakely Date: Mon Jun 14 22:42:05 2021 +0100 libstdc++: Fix noexcept-specifier for ranges::empty Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/range_access.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/range_access.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/range_access.h b/libstdc++-v3/include/bits/range_access.h index 36bc55e6559..aee72c3fae4 100644 --- a/libstdc++-v3/include/bits/range_access.h +++ b/libstdc++-v3/include/bits/range_access.h @@ -773,7 +773,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 4b54ed7b367..47dfca6513f 100644 --- a/libstdc++-v3/testsuite/std/ranges/access/empty.cc +++ b/libstdc++-v3/testsuite/std/ranges/access/empty.cc @@ -68,9 +68,40 @@ test02() VERIFY( !std::ranges::empty(so) ); } +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(); + test04(); }