From b0b4a253087edb32c7c1b7f07e156d6caf6ff3b3 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 31 Oct 2012 01:09:59 +0000 Subject: [PATCH] forward_list.h (forward_list): Adjust comments. * include/bits/forward_list.h (forward_list): Adjust comments. (forward_list(const forward_list&, const _Alloc&)): Use _M_range_initialize to copy elements. (forward_list(forward_list&&, const _Alloc&)): Add exception specification. (_Fwd_list_base(const _Fwd_list_base&, const _Node_alloc_type&)): Remove. * include/bits/forward_list.tcc (_Fwd_list_base(const _Fwd_list_base&, const _Node_alloc_type&)): Remove. (_Fwd_list_base(_Fwd_list_base&&, const _Node_alloc_type&)): Fix memory leak when allocators are not equal. From-SVN: r193009 --- libstdc++-v3/ChangeLog | 16 ++++++++++- libstdc++-v3/include/bits/forward_list.h | 33 ++++++++-------------- libstdc++-v3/include/bits/forward_list.tcc | 25 ++++------------ 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 52dad4406c2..3b2cb0d29ff 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2012-10-31 Jonathan Wakely + + * include/bits/forward_list.h (forward_list): Adjust comments. + (forward_list(const forward_list&, const _Alloc&)): Use + _M_range_initialize to copy elements. + (forward_list(forward_list&&, const _Alloc&)): Add exception + specification. + (_Fwd_list_base(const _Fwd_list_base&, const _Node_alloc_type&)): + Remove. + * include/bits/forward_list.tcc (_Fwd_list_base(const _Fwd_list_base&, + const _Node_alloc_type&)): Remove. + (_Fwd_list_base(_Fwd_list_base&&, const _Node_alloc_type&)): Fix + memory leak when allocators are not equal. + 2012-10-29 Jonathan Wakely PR libstdc++/55123 @@ -336,7 +350,7 @@ 2012-10-09 Daniel Krugler - * include/std/type_traits (common_time): Provide "SFINAE-friendly" + * include/std/type_traits (common_type): Provide "SFINAE-friendly" implementation. (__success_type, __failure_type): Fix. * include/std/chrono (common_type): Likewise for the chrono::time_point diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index a5c9f434b35..8d4915d0e4d 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -314,8 +314,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _Fwd_list_base(const _Node_alloc_type& __a) : _M_impl(__a) { } - _Fwd_list_base(const _Fwd_list_base& __lst, const _Node_alloc_type& __a); - _Fwd_list_base(_Fwd_list_base&& __lst, const _Node_alloc_type& __a); _Fwd_list_base(_Fwd_list_base&& __lst) @@ -394,14 +392,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * Also unlike the other standard containers, std::forward_list provides * specialized algorithms %unique to linked lists, such as * splicing, sorting, and in-place reversal. - * - * A couple points on memory allocation for forward_list: - * - * First, we never actually allocate a Tp, we allocate - * Fwd_list_node's and trust [20.1.5]/4 to DTRT. This is to ensure - * that after elements from %forward_list are spliced into - * %forward_list, destroying the memory of the second %list is a - * valid operation, i.e., Alloc1 giveth and Alloc2 taketh away. */ template > class forward_list : private _Fwd_list_base<_Tp, _Alloc> @@ -429,7 +419,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER typedef std::ptrdiff_t difference_type; typedef _Alloc allocator_type; - // 23.2.3.1 construct/copy/destroy: + // 23.3.4.2 construct/copy/destroy: /** * @brief Creates a %forward_list with no elements. @@ -446,8 +436,8 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @param __al An allocator object. */ forward_list(const forward_list& __list, const _Alloc& __al) - : _Base(__list, _Node_alloc_type(__al)) - { } + : _Base(_Node_alloc_type(__al)) + { _M_range_initialize(__list.begin(), __list.end()); } /** * @brief Move constructor with allocator argument. @@ -455,6 +445,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @param __al An allocator object. */ forward_list(forward_list&& __list, const _Alloc& __al) + noexcept(_Node_alloc_traits::_S_always_equal()) : _Base(std::move(__list), _Node_alloc_type(__al)) { } @@ -504,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /** * @brief The %forward_list copy constructor. * @param __list A %forward_list of identical element and allocator - * types. + * types. */ forward_list(const forward_list& __list) : _Base(_Node_alloc_traits::_S_select_on_copy( @@ -514,10 +505,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /** * @brief The %forward_list move constructor. * @param __list A %forward_list of identical element and allocator - * types. + * types. * * The newly-created %forward_list contains the exact contents of @a - * forward_list. The contents of @a __list are a valid, but unspecified + * __list. The contents of @a __list are a valid, but unspecified * %forward_list. */ forward_list(forward_list&& __list) noexcept @@ -647,7 +638,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER get_allocator() const noexcept { return allocator_type(this->_M_get_Node_allocator()); } - // 23.2.3.2 iterators: + // 23.3.4.3 iterators: /** * Returns a read/write iterator that points before the first element @@ -743,7 +734,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER max_size() const noexcept { return _Node_alloc_traits::max_size(this->_M_get_Node_allocator()); } - // 23.2.3.3 element access: + // 23.3.4.4 element access: /** * Returns a read/write reference to the data at the first @@ -767,7 +758,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return __front->_M_value; } - // 23.2.3.4 modifiers: + // 23.3.4.5 modifiers: /** * @brief Constructs object in %forward_list at the front of the @@ -1031,7 +1022,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER clear() noexcept { this->_M_erase_after(&this->_M_impl._M_head, 0); } - // 23.2.3.5 forward_list operations: + // 23.3.4.6 forward_list operations: /** * @brief Insert contents of another %forward_list. @@ -1223,7 +1214,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { this->_M_impl._M_head._M_reverse_after(); } private: - // Called by the range constructor to implement [23.1.1]/9 + // Called by the range constructor to implement [23.3.4.2]/9 template void _M_range_initialize(_InputIterator __first, _InputIterator __last); diff --git a/libstdc++-v3/include/bits/forward_list.tcc b/libstdc++-v3/include/bits/forward_list.tcc index 5d18a6ebf44..4f9a7fad4eb 100644 --- a/libstdc++-v3/include/bits/forward_list.tcc +++ b/libstdc++-v3/include/bits/forward_list.tcc @@ -34,30 +34,16 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_CONTAINER - template - _Fwd_list_base<_Tp, _Alloc>:: - _Fwd_list_base(const _Fwd_list_base& __lst, const _Node_alloc_type& __a) - : _M_impl(__a) - { - this->_M_impl._M_head._M_next = 0; - _Fwd_list_node_base* __to = &this->_M_impl._M_head; - _Node* __curr = static_cast<_Node*>(__lst._M_impl._M_head._M_next); - - while (__curr) - { - __to->_M_next = _M_create_node(__curr->_M_value); - __to = __to->_M_next; - __curr = static_cast<_Node*>(__curr->_M_next); - } - } - template _Fwd_list_base<_Tp, _Alloc>:: _Fwd_list_base(_Fwd_list_base&& __lst, const _Node_alloc_type& __a) : _M_impl(__a) { if (__lst._M_get_Node_allocator() == __a) - this->_M_impl._M_head._M_next = __lst._M_impl._M_head._M_next; + { + this->_M_impl._M_head._M_next = __lst._M_impl._M_head._M_next; + __lst._M_impl._M_head._M_next = 0; + } else { this->_M_impl._M_head._M_next = 0; @@ -72,7 +58,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER __curr = static_cast<_Node*>(__curr->_M_next); } } - __lst._M_impl._M_head._M_next = 0; } template @@ -119,7 +104,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER return __last; } - // Called by the range constructor to implement [23.1.1]/9 + // Called by the range constructor to implement [23.3.4.2]/9 template template void