[gcc r9-9336] libstdc++: Fix bootstrap error due to inconsistent noexcept-specifier [PR 99983]

Jonathan Wakely redi@gcc.gnu.org
Fri Apr 9 16:42:19 GMT 2021


https://gcc.gnu.org/g:9aeab5815df1ec52b1048a157ef243a4c45234b7

commit r9-9336-g9aeab5815df1ec52b1048a157ef243a4c45234b7
Author: Jonathan Wakely <jwakely@redhat.com>
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),


More information about the Libstdc++-cvs mailing list