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 r11-8085] libstdc++: Fix invalid constexpr function in C++11 mode [PR 99985] Date: Fri, 9 Apr 2021 12:09:43 +0000 (GMT) [thread overview] Message-ID: <20210409120943.B47A7398B432@sourceware.org> (raw) https://gcc.gnu.org/g:40ccb47b505b528244ee305923681c0ae3b6f4d5 commit r11-8085-g40ccb47b505b528244ee305923681c0ae3b6f4d5 Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Apr 9 12:05:39 2021 +0100 libstdc++: Fix invalid constexpr function in C++11 mode [PR 99985] I keep forgetting that a constexpr function in C++11 has to be a single return statement. libstdc++-v3/ChangeLog: PR libstdc++/99985 * include/bits/hashtable.h (_Hashtable::_S_nothrow_move()): Fix to be a valid constexpr function in C++11. * testsuite/23_containers/unordered_set/cons/99985.cc: New test. Diff: --- libstdc++-v3/include/bits/hashtable.h | 10 ++++- .../23_containers/unordered_set/cons/99985.cc | 47 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 39872ce5342..6711d08e6b8 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -476,10 +476,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static constexpr bool _S_nothrow_move() { - if _GLIBCXX17_CONSTEXPR (_No_realloc) - if _GLIBCXX17_CONSTEXPR (is_nothrow_copy_constructible<_Hash>()) +#if __cplusplus <= 201402L + return __and_<__bool_constant<_No_realloc>, + is_nothrow_copy_constructible<_Hash>, + is_nothrow_copy_constructible<_Equal>>::value; +#else + if constexpr (_No_realloc) + if constexpr (is_nothrow_copy_constructible<_Hash>()) return is_nothrow_copy_constructible<_Equal>(); return false; +#endif } _Hashtable(_Hashtable&& __ht, __node_alloc_type&& __a, diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/cons/99985.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/99985.cc new file mode 100644 index 00000000000..b209f7627f5 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/cons/99985.cc @@ -0,0 +1,47 @@ +// Copyright (C) 2021 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-options "-std=gnu++11" } +// { dg-do compile { target c++11 } } + +#include <unordered_set> +#include <testsuite_allocator.h> + +template<typename Alloc, typename T = typename Alloc::value_type> + using Set = std::unordered_set<T, std::hash<T>, std::equal_to<T>, Alloc>; + +// PR libstdc++/99985 - invalid constexpr function in C++11 mode + +void +test01() +{ + using A = std::allocator<int>; + A a; + Set<A> s; + static_assert( noexcept( Set<A>(std::move(s)) ), "non-throwing" ); + static_assert( noexcept( Set<A>(std::move(s), a) ), "non-throwing" ); +} + +void +test02() +{ + using A = __gnu_test::uneq_allocator<long>; + A a; + Set<A> s; + static_assert( noexcept( Set<A>(std::move(s)) ), "non-throwing" ); + static_assert( ! noexcept( Set<A>(std::move(s), a) ), "throwing" ); +}
reply other threads:[~2021-04-09 12:09 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=20210409120943.B47A7398B432@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).