Skip to content

R
riscv-gcc-1
Commit 290df23d by Paolo Carlini Committed by Paolo Carlini
Options

hashtable.h (_Hashtable<>::_Hashtable(_Hashtable&&)): Remove noexcept, the move… 

hashtable.h (_Hashtable<>::_Hashtable(_Hashtable&&)): Remove noexcept, the move constructor allocates memory...

2011-09-01  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/hashtable.h (_Hashtable<>::_Hashtable(_Hashtable&&)):
	Remove noexcept, the move constructor allocates memory; rearrange
	the code in the body to consistently update __ht._M_rehash_policy
	before using _M_next_bkt on it.
	* include/debug/unordered_map: Adjust.
	* include/debug/unordered_set: Likewise.
	* include/profile/unordered_map: Likewise.
	* include/profile/unordered_set: Likewise.
	* testsuite/23_containers/unordered_map/cons/
	noexcept_move_construct.cc: Remove.
	* testsuite/23_containers/unordered_set/cons/
	noexcept_move_construct.cc: Likewise.
	* testsuite/23_containers/unordered_multimap/cons/
	noexcept_move_construct.cc: Likewise.
	* testsuite/23_containers/unordered_multiset/cons/
	noexcept_move_construct.cc: Likewise.

From-SVN: r178423
parent d51813db
Showing with 22 additions and 130 deletions
libstdc++-v3/ChangeLog
2011-09-01 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/hashtable.h (_Hashtable<>::_Hashtable(_Hashtable&&)):
Remove noexcept, the move constructor allocates memory; rearrange
the code in the body to consistently update __ht._M_rehash_policy
before using _M_next_bkt on it.
* include/debug/unordered_map: Adjust.
* include/debug/unordered_set: Likewise.
* include/profile/unordered_map: Likewise.
* include/profile/unordered_set: Likewise.
* testsuite/23_containers/unordered_map/cons/
noexcept_move_construct.cc: Remove.
* testsuite/23_containers/unordered_set/cons/
noexcept_move_construct.cc: Likewise.
* testsuite/23_containers/unordered_multimap/cons/
noexcept_move_construct.cc: Likewise.
* testsuite/23_containers/unordered_multiset/cons/
noexcept_move_construct.cc: Likewise.
2011-08-31 Paolo Carlini <paolo.carlini@oracle.com> 2011-08-31 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/chrono (operator*(const _Rep1&, const duration<>&)): * include/std/chrono (operator*(const _Rep1&, const duration<>&)):
......
libstdc++-v3/include/bits/hashtable.h
...@@ -674,8 +674,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -674,8 +674,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal, _Hashtable<_Key, _Value, _Allocator, _ExtractKey, _Equal,
_H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>:: _H1, _H2, _Hash, _RehashPolicy, __chc, __cit, __uk>::
_Hashtable(_Hashtable&& __ht) _Hashtable(_Hashtable&& __ht)
noexcept(__and_<is_nothrow_copy_constructible<_Equal>,
is_nothrow_copy_constructible<_H1>>::value)
: __detail::_Rehash_base<_RehashPolicy, _Hashtable>(__ht), : __detail::_Rehash_base<_RehashPolicy, _Hashtable>(__ht),
__detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal, __detail::_Hash_code_base<_Key, _Value, _ExtractKey, _Equal,
_H1, _H2, _Hash, __chc>(__ht), _H1, _H2, _Hash, __chc>(__ht),
...@@ -687,12 +685,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -687,12 +685,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_element_count(__ht._M_element_count), _M_element_count(__ht._M_element_count),
_M_rehash_policy(__ht._M_rehash_policy) _M_rehash_policy(__ht._M_rehash_policy)
{ {
size_type __n_bkt = __ht._M_rehash_policy._M_next_bkt(0); __ht._M_rehash_policy = _RehashPolicy();
__ht._M_buckets = __ht._M_allocate_buckets(__n_bkt); __ht._M_bucket_count = __ht._M_rehash_policy._M_next_bkt(0);
__ht._M_bucket_count = __n_bkt; __ht._M_buckets = __ht._M_allocate_buckets(__ht._M_bucket_count);
__ht._M_begin_bucket_index = __ht._M_bucket_count; __ht._M_begin_bucket_index = __ht._M_bucket_count;
__ht._M_element_count = 0; __ht._M_element_count = 0;
__ht._M_rehash_policy = _RehashPolicy();
} }
template<typename _Key, typename _Value, template<typename _Key, typename _Value,
......
libstdc++-v3/include/debug/unordered_map
...@@ -104,8 +104,6 @@ namespace __debug ...@@ -104,8 +104,6 @@ namespace __debug
: _Base(__x) { } : _Base(__x) { }
unordered_map(unordered_map&& __x) unordered_map(unordered_map&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) { } : _Base(std::move(__x)) { }
unordered_map(initializer_list<value_type> __l, unordered_map(initializer_list<value_type> __l,
...@@ -485,8 +483,6 @@ namespace __debug ...@@ -485,8 +483,6 @@ namespace __debug
: _Base(__x) { } : _Base(__x) { }
unordered_multimap(unordered_multimap&& __x) unordered_multimap(unordered_multimap&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) { } : _Base(std::move(__x)) { }
unordered_multimap(initializer_list<value_type> __l, unordered_multimap(initializer_list<value_type> __l,
......
libstdc++-v3/include/debug/unordered_set
...@@ -104,8 +104,6 @@ namespace __debug ...@@ -104,8 +104,6 @@ namespace __debug
: _Base(__x) { } : _Base(__x) { }
unordered_set(unordered_set&& __x) unordered_set(unordered_set&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) { } : _Base(std::move(__x)) { }
unordered_set(initializer_list<value_type> __l, unordered_set(initializer_list<value_type> __l,
...@@ -480,8 +478,6 @@ namespace __debug ...@@ -480,8 +478,6 @@ namespace __debug
: _Base(__x) { } : _Base(__x) { }
unordered_multiset(unordered_multiset&& __x) unordered_multiset(unordered_multiset&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) { } : _Base(std::move(__x)) { }
unordered_multiset(initializer_list<value_type> __l, unordered_multiset(initializer_list<value_type> __l,
......
libstdc++-v3/include/profile/unordered_map
...@@ -104,8 +104,6 @@ namespace __profile ...@@ -104,8 +104,6 @@ namespace __profile
} }
unordered_map(unordered_map&& __x) unordered_map(unordered_map&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) : _Base(std::move(__x))
{ {
__profcxx_hashtable_construct(this, _Base::bucket_count()); __profcxx_hashtable_construct(this, _Base::bucket_count());
...@@ -374,8 +372,6 @@ namespace __profile ...@@ -374,8 +372,6 @@ namespace __profile
} }
unordered_multimap(unordered_multimap&& __x) unordered_multimap(unordered_multimap&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) : _Base(std::move(__x))
{ {
__profcxx_hashtable_construct(this, _Base::bucket_count()); __profcxx_hashtable_construct(this, _Base::bucket_count());
......
libstdc++-v3/include/profile/unordered_set
...@@ -103,8 +103,6 @@ namespace __profile ...@@ -103,8 +103,6 @@ namespace __profile
} }
unordered_set(unordered_set&& __x) unordered_set(unordered_set&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) : _Base(std::move(__x))
{ {
__profcxx_hashtable_construct(this, _Base::bucket_count()); __profcxx_hashtable_construct(this, _Base::bucket_count());
...@@ -348,8 +346,6 @@ namespace __profile ...@@ -348,8 +346,6 @@ namespace __profile
} }
unordered_multiset(unordered_multiset&& __x) unordered_multiset(unordered_multiset&& __x)
noexcept(__and_<is_nothrow_copy_constructible<_Hash>,
is_nothrow_copy_constructible<_Pred>>::value)
: _Base(std::move(__x)) : _Base(std::move(__x))
{ {
__profcxx_hashtable_construct(this, _Base::bucket_count()); __profcxx_hashtable_construct(this, _Base::bucket_count());
......
libstdc++-v3/testsuite/23_containers/unordered_map/cons/noexcept_move_construct.cc deleted 100644 → 0
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com>
//
// Copyright (C) 2011 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/>.
#include <unordered_map>
typedef std::unordered_map<int, int> umtype;
static_assert(std::is_nothrow_move_constructible<umtype>::value, "Error");
libstdc++-v3/testsuite/23_containers/unordered_multimap/cons/noexcept_move_construct.cc deleted 100644 → 0
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com>
//
// Copyright (C) 2011 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/>.
#include <unordered_map>
typedef std::unordered_multimap<int, int> ummtype;
static_assert(std::is_nothrow_move_constructible<ummtype>::value, "Error");
libstdc++-v3/testsuite/23_containers/unordered_multiset/cons/noexcept_move_construct.cc deleted 100644 → 0
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com>
//
// Copyright (C) 2011 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/>.
#include <unordered_set>
typedef std::unordered_multiset<int> umstype;
static_assert(std::is_nothrow_move_constructible<umstype>::value, "Error");
libstdc++-v3/testsuite/23_containers/unordered_set/cons/noexcept_move_construct.cc deleted 100644 → 0
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// 2011-06-01 Paolo Carlini <paolo.carlini@oracle.com>
//
// Copyright (C) 2011 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/>.
#include <unordered_set>
typedef std::unordered_set<int> ustype;
static_assert(std::is_nothrow_move_constructible<ustype>::value, "Error");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment