From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1E4A13AA7C93; Fri, 9 Apr 2021 16:42:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E4A13AA7C93 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 r9-9336] libstdc++: Fix bootstrap error due to inconsistent noexcept-specifier [PR 99983] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 6b66d162835621c81a78f361416149d914d31de8 X-Git-Newrev: 9aeab5815df1ec52b1048a157ef243a4c45234b7 Message-Id: <20210409164219.1E4A13AA7C93@sourceware.org> Date: Fri, 9 Apr 2021 16:42:19 +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: Fri, 09 Apr 2021 16:42:19 -0000 https://gcc.gnu.org/g:9aeab5815df1ec52b1048a157ef243a4c45234b7 commit r9-9336-g9aeab5815df1ec52b1048a157ef243a4c45234b7 Author: Jonathan Wakely Date: Fri Apr 9 15:47:26 2021 +0100 libstdc++: Fix bootstrap error due to inconsistent noexcept-specifier [PR 99983] The backport of r11-8062 as r9-9328 missed out a piece, which causes bootstrap failures. PR bootstrap/99983 * include/bits/hashtable.h (_Hashtable): Fix noexcept-specifier on definition to match the one on the declaration. Diff: --- libstdc++-v3/include/bits/hashtable.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 6bb83bec4e3..910cbaecae2 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -1283,8 +1283,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _H1, _H2, _Hash, _RehashPolicy, _Traits>:: _Hashtable(_Hashtable&& __ht, __node_alloc_type&& __a, true_type /* alloc always equal */) - noexcept(std::is_nothrow_copy_constructible<_H1>::value && - std::is_nothrow_copy_constructible<_Equal>::value) + noexcept(_S_nothrow_move()) : __hashtable_base(__ht), __map_base(__ht), __rehash_base(__ht),