2011-06-12 François Dumont <francois.cppdevs@free.fr>
Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/allocator.h (__shrink_to_fit): Rename to
__shrink_to_fit_aux, fix.
* include/bits/stl_vector.h (_M_shrink_to_fit): Declare.
(shrink_to_fit): Use the latter.
* include/debug/vector (shrink_to_fit): Likewise.
* include/bits/vector.tcc (_M_shrink_to_fit): Define.
* include/bits/stl_deque.h (_M_shrink_to_fit): Declare.
(shrink_to_fit): Use the latter.
* include/debug/deque (shrink_to_fit): Likewise.
* include/bits/deque.tcc (_M_shrink_to_fit): Define.
* include/bits/vector.tcc (vector<bool>::_M_reallocate): Add.
* include/bits/stl_bvector.h (_M_shrink_to_fit): Declare.
(shrink_to_fit): Use the latter.
(reserve): Use _M_reallocate, move inline.
(_Bvector_base<>::_S_nword): Add, use it throughout.
* include/debug/string (shrink_to_fit): Redo.
* include/ext/vstring.h (shrink_to_fit): Optimize.
* include/bits/basic_string.h (shrink_to_fit): Likewise.
* testsuite/21_strings/debug/shrink_to_fit.cc: New.
* testsuite/23_containers/vector/debug/shrink_to_fit.cc: Likewise.
* testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc:
Likewise.
* testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc:
Likewise.
* testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise.
Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com>
From-SVN: r174967
+2011-06-12 François Dumont <francois.cppdevs@free.fr>
+ Paolo Carlini <paolo.carlini@oracle.com>
+
+ * include/bits/allocator.h (__shrink_to_fit): Rename to
+ __shrink_to_fit_aux, fix.
+ * include/bits/stl_vector.h (_M_shrink_to_fit): Declare.
+ (shrink_to_fit): Use the latter.
+ * include/debug/vector (shrink_to_fit): Likewise.
+ * include/bits/vector.tcc (_M_shrink_to_fit): Define.
+ * include/bits/stl_deque.h (_M_shrink_to_fit): Declare.
+ (shrink_to_fit): Use the latter.
+ * include/debug/deque (shrink_to_fit): Likewise.
+ * include/bits/deque.tcc (_M_shrink_to_fit): Define.
+ * include/bits/vector.tcc (vector<bool>::_M_reallocate): Add.
+ * include/bits/stl_bvector.h (_M_shrink_to_fit): Declare.
+ (shrink_to_fit): Use the latter.
+ (reserve): Use _M_reallocate, move inline.
+ (_Bvector_base<>::_S_nword): Add, use it throughout.
+ * include/debug/string (shrink_to_fit): Redo.
+ * include/ext/vstring.h (shrink_to_fit): Optimize.
+ * include/bits/basic_string.h (shrink_to_fit): Likewise.
+ * testsuite/21_strings/debug/shrink_to_fit.cc: New.
+ * testsuite/23_containers/vector/debug/shrink_to_fit.cc: Likewise.
+ * testsuite/23_containers/vector/debug/bool/shrink_to_fit.cc:
+ Likewise.
+ * testsuite/23_containers/vector/bool/capacity/shrink_to_fit.cc:
+ Likewise.
+ * testsuite/23_containers/deque/debug/shrink_to_fit.cc: Likewise.
+
2011-06-11 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/ext/extptr_allocator.h (construct, destroy): Fix for C++0x
};
#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ template<typename _Tp, bool
+ = __or_<is_copy_constructible<typename _Tp::value_type>,
+ is_nothrow_move_constructible<typename _Tp::value_type>>::value>
+ struct __shrink_to_fit_aux
+ { static bool _S_do_it(_Tp&) { return false; } };
+
template<typename _Tp>
- bool
- __shrink_to_fit(_Tp& __v)
+ struct __shrink_to_fit_aux<_Tp, true>
{
- __try
- {
- _Tp(__v).swap(__v);
- return true;
- }
- __catch(...)
- { return false; }
- }
+ static bool
+ _S_do_it(_Tp& __c)
+ {
+ __try
+ {
+ _Tp(__make_move_if_noexcept_iterator(__c.begin()),
+ __make_move_if_noexcept_iterator(__c.end())).swap(__c);
+ return true;
+ }
+ __catch(...)
+ { return false; }
+ }
+ };
template<typename _Alloc, typename _Tp>
class __alloctr_rebind_helper
void
shrink_to_fit()
{
- __try
- { reserve(0); }
- __catch(...)
- { }
+ if (capacity() > size())
+ {
+ __try
+ { reserve(0); }
+ __catch(...)
+ { }
+ }
}
#endif
}
}
}
+
+ template <typename _Tp, typename _Alloc>
+ bool
+ deque<_Tp, _Alloc>::
+ _M_shrink_to_fit()
+ {
+ const difference_type __front_capacity
+ = (this->_M_impl._M_start._M_cur - this->_M_impl._M_start._M_first);
+ if (__front_capacity == 0)
+ return false;
+
+ const difference_type __back_capacity
+ = (this->_M_impl._M_finish._M_last - this->_M_impl._M_finish._M_cur);
+ if (__front_capacity + __back_capacity < _S_buffer_size())
+ return false;
+
+ return std::__shrink_to_fit_aux<deque>::_S_do_it(*this);
+ }
#endif
template <typename _Tp, typename _Alloc>
_Bit_type*
_M_allocate(size_t __n)
- { return _M_impl.allocate((__n + int(_S_word_bit) - 1)
- / int(_S_word_bit)); }
+ { return _M_impl.allocate(_S_nword(__n)); }
void
_M_deallocate()
_M_impl.deallocate(_M_impl._M_start._M_p,
_M_impl._M_end_of_storage - _M_impl._M_start._M_p);
}
+
+ static size_t
+ _S_nword(size_t __n)
+ { return (__n + int(_S_word_bit) - 1) / int(_S_word_bit); }
};
_GLIBCXX_END_NAMESPACE_CONTAINER
protected:
using _Base::_M_allocate;
using _Base::_M_deallocate;
+ using _Base::_S_nword;
using _Base::_M_get_Bit_allocator;
public:
{ _M_range_check(__n); return (*this)[__n]; }
void
- reserve(size_type __n);
+ reserve(size_type __n)
+ {
+ if (__n > max_size())
+ __throw_length_error(__N("vector::reserve"));
+ if (capacity() < __n)
+ _M_reallocate(__n);
+ }
reference
front()
#ifdef __GXX_EXPERIMENTAL_CXX0X__
void
shrink_to_fit()
- { std::__shrink_to_fit(*this); }
+ { _M_shrink_to_fit(); }
#endif
void
_M_initialize(size_type __n)
{
_Bit_type* __q = this->_M_allocate(__n);
- this->_M_impl._M_end_of_storage = (__q
- + ((__n + int(_S_word_bit) - 1)
- / int(_S_word_bit)));
+ this->_M_impl._M_end_of_storage = __q + _S_nword(__n);
this->_M_impl._M_start = iterator(__q, 0);
this->_M_impl._M_finish = this->_M_impl._M_start + difference_type(__n);
}
+ void
+ _M_reallocate(size_type __n);
+
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ bool
+ _M_shrink_to_fit();
+#endif
+
// Check whether it's an integral type. If so, it's not an iterator.
// _GLIBCXX_RESOLVE_LIB_DEFECTS
/** A non-binding request to reduce memory use. */
void
shrink_to_fit()
- { std::__shrink_to_fit(*this); }
+ { _M_shrink_to_fit(); }
#endif
/**
// Called by resize(sz).
void
_M_default_append(size_type __n);
+
+ bool
+ _M_shrink_to_fit();
#endif
//@{
/** A non-binding request to reduce capacity() to size(). */
void
shrink_to_fit()
- { std::__shrink_to_fit(*this); }
+ { _M_shrink_to_fit(); }
#endif
/**
// Called by resize(n).
void
_M_default_append(size_type __n);
+
+ bool
+ _M_shrink_to_fit();
#endif
// Called by insert(p,x)
}
}
}
+
+ template<typename _Tp, typename _Alloc>
+ bool
+ vector<_Tp, _Alloc>::
+ _M_shrink_to_fit()
+ {
+ if (capacity() == size())
+ return false;
+ return std::__shrink_to_fit_aux<vector>::_S_do_it(*this);
+ }
#endif
template<typename _Tp, typename _Alloc>
// vector<bool>
-
template<typename _Alloc>
void
vector<bool, _Alloc>::
- reserve(size_type __n)
+ _M_reallocate(size_type __n)
{
- if (__n > this->max_size())
- __throw_length_error(__N("vector::reserve"));
- if (this->capacity() < __n)
- {
- _Bit_type* __q = this->_M_allocate(__n);
- this->_M_impl._M_finish = _M_copy_aligned(begin(), end(),
- iterator(__q, 0));
- this->_M_deallocate();
- this->_M_impl._M_start = iterator(__q, 0);
- this->_M_impl._M_end_of_storage = (__q + (__n + int(_S_word_bit) - 1)
- / int(_S_word_bit));
- }
+ _Bit_type* __q = this->_M_allocate(__n);
+ this->_M_impl._M_finish = _M_copy_aligned(begin(), end(),
+ iterator(__q, 0));
+ this->_M_deallocate();
+ this->_M_impl._M_start = iterator(__q, 0);
+ this->_M_impl._M_end_of_storage = __q + _S_nword(__n);
}
template<typename _Alloc>
this->_M_impl._M_finish = std::copy(__position, end(),
__i + difference_type(__n));
this->_M_deallocate();
- this->_M_impl._M_end_of_storage = (__q + ((__len
- + int(_S_word_bit) - 1)
- / int(_S_word_bit)));
+ this->_M_impl._M_end_of_storage = __q + _S_nword(__len);
this->_M_impl._M_start = iterator(__q, 0);
}
}
__i = std::copy(__first, __last, __i);
this->_M_impl._M_finish = std::copy(__position, end(), __i);
this->_M_deallocate();
- this->_M_impl._M_end_of_storage = (__q
- + ((__len
- + int(_S_word_bit) - 1)
- / int(_S_word_bit)));
+ this->_M_impl._M_end_of_storage = __q + _S_nword(__len);
this->_M_impl._M_start = iterator(__q, 0);
}
}
*__i++ = __x;
this->_M_impl._M_finish = std::copy(__position, end(), __i);
this->_M_deallocate();
- this->_M_impl._M_end_of_storage = (__q + ((__len
- + int(_S_word_bit) - 1)
- / int(_S_word_bit)));
+ this->_M_impl._M_end_of_storage = __q + _S_nword(__len);
this->_M_impl._M_start = iterator(__q, 0);
}
}
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+ template<typename _Alloc>
+ bool
+ vector<bool, _Alloc>::
+ _M_shrink_to_fit()
+ {
+ if (capacity() - size() < int(_S_word_bit))
+ return false;
+ __try
+ {
+ _M_reallocate(size());
+ return true;
+ }
+ __catch(...)
+ { return false; }
+ }
+#endif
+
_GLIBCXX_END_NAMESPACE_CONTAINER
} // namespace std
#endif
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- using _Base::shrink_to_fit;
+ void
+ shrink_to_fit()
+ {
+ if (_Base::_M_shrink_to_fit())
+ this->_M_invalidate_all();
+ }
#endif
using _Base::empty;
{ this->resize(__n, _CharT()); }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- using _Base::shrink_to_fit;
+ void
+ shrink_to_fit()
+ {
+ if (capacity() > size())
+ {
+ __try
+ {
+ reserve(0);
+ this->_M_invalidate_all();
+ }
+ __catch(...)
+ { }
+ }
+ }
#endif
using _Base::capacity;
#endif
#ifdef __GXX_EXPERIMENTAL_CXX0X__
- using _Base::shrink_to_fit;
+ void
+ shrink_to_fit()
+ {
+ if (_Base::_M_shrink_to_fit())
+ {
+ _M_guaranteed_capacity = _Base::capacity();
+ this->_M_invalidate_all();
+ }
+ }
#endif
size_type
void
shrink_to_fit()
{
- __try
- { this->reserve(0); }
- __catch(...)
- { }
+ if (capacity() > size())
+ {
+ __try
+ { this->reserve(0); }
+ __catch(...)
+ { }
+ }
}
#endif
--- /dev/null
+// 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/>.
+//
+// { dg-options "-std=gnu++0x" }
+// { dg-do run { xfail *-*-* } }
+
+#include <debug/string>
+
+void test01()
+{
+ using __gnu_debug::string;
+ string s;
+ s.reserve(2);
+ s.push_back('a');
+ string::iterator it = s.begin();
+ s.shrink_to_fit();
+ // Following line should assert
+ *it = 'z';
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--- /dev/null
+// 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/>.
+//
+// { dg-require-debug-mode "" }
+// { dg-options "-std=gnu++0x" }
+// { dg-do run { xfail *-*-* } }
+
+#include <deque>
+
+void test01()
+{
+ using std::deque;
+ deque<int> d;
+ // Lets generate a hole at the begining of the deque:
+ d.push_back(0);
+ d.push_back(1);
+ d.pop_front();
+ deque<int>::iterator it;
+ do
+ {
+ d.push_back(2);
+ it = d.begin();
+ auto old_abegin = &*d.begin();
+ d.shrink_to_fit();
+ if (&*d.begin() != old_abegin)
+ break;
+ }
+ while (true);
+ // Following line should assert
+ *it = 2;
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--- /dev/null
+// { dg-options "-std=gnu++0x" }
+
+// 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 <vector>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+
+ std::vector<bool> vb(__CHAR_BIT__ * sizeof(unsigned long) + 1);
+ vb.pop_back();
+
+ auto old_capacity = vb.capacity();
+ vb.shrink_to_fit();
+ VERIFY( vb.capacity() < old_capacity );
+ VERIFY( vb.size() == vb.capacity() );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--- /dev/null
+// 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/>.
+//
+// { dg-require-debug-mode "" }
+// { dg-options "-std=gnu++0x" }
+// { dg-do run { xfail *-*-* } }
+
+#include <vector>
+
+void test01()
+{
+ using std::vector;
+
+ vector<bool> vb(__CHAR_BIT__ * sizeof(unsigned long) + 1);
+ vb.pop_back();
+
+ vector<bool>::iterator it = vb.begin();
+ vb.shrink_to_fit();
+
+ // Following line should assert
+ *it = true;
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--- /dev/null
+// 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/>.
+//
+// { dg-require-debug-mode "" }
+// { dg-options "-std=gnu++0x" }
+// { dg-do run { xfail *-*-* } }
+
+#include <vector>
+
+void test01()
+{
+ using std::vector;
+ vector<int> v;
+ v.reserve(2);
+ v.push_back(0);
+ vector<int>::iterator it = v.begin();
+ v.shrink_to_fit();
+ // Following line should assert
+ *it = 1;
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
projects / gcc.git / commitdiff