diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 64db4028983..a572b0bfaa5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2005-05-28 Paolo Carlini + + Revert: + 2005-05-18 Paolo Carlini + Nathan Myers + + PR libstdc++/19495 + * include/bits/basic_string.h (_Raw_bytes_alloc): Rebind to + size_type instead of char and rename to _Raw_alloc. + * include/bits/basic_string.tcc (_Rep::_M_destroy, _Rep::_S_create): + Use the above. + * src/bitmap_allocator.cc: Add instantiation for size_type. + * src/mt_allocator.cc: Likewise. + * src/pool_allocator.cc: Likewise. + * include/ext/array_allocator.h: Tweak slightly, avoid assuming + the existence of an _Array::begin() and size() members. + * testsuite/ext/array_allocator/2.cc: Tweak to use an allocator + of size_type, instead of char, thus avoiding problems with + rebinds, not treated correctly by array_allocator. + 2005-05-27 Paolo Carlini * docs/html/abi.html: Mention 3.4.0 as the current baseline; add diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 001a68f1008..c889ce64b37 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -151,7 +151,7 @@ namespace std struct _Rep : _Rep_base { // Types: - typedef typename _Alloc::template rebind::other _Raw_alloc; + typedef typename _Alloc::template rebind::other _Raw_bytes_alloc; // (Public) Data members: diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 672457f9be9..41db0dff438 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -425,10 +425,9 @@ namespace std basic_string<_CharT, _Traits, _Alloc>::_Rep:: _M_destroy(const _Alloc& __a) throw () { - const size_type __size = ((this->_M_capacity + 1) * sizeof(_CharT) - + sizeof(_Rep_base) + sizeof(size_type) - 1); - _Raw_alloc(__a).deallocate(reinterpret_cast(this), __size - / sizeof(size_type)); + const size_type __size = sizeof(_Rep_base) + + (this->_M_capacity + 1) * sizeof(_CharT); + _Raw_bytes_alloc(__a).deallocate(reinterpret_cast(this), __size); } template @@ -569,12 +568,9 @@ namespace std __capacity = 2 * __old_capacity; // NB: Need an array of char_type[__capacity], plus a terminating - // null char_type() element, plus enough for the _Rep data structure, - // plus sizeof(size_type) - 1 to upper round to a size multiple - // of sizeof(size_type). + // null char_type() element, plus enough for the _Rep data structure. // Whew. Seemingly so needy, yet so elemental. - size_type __size = ((__capacity + 1) * sizeof(_CharT) + sizeof(_Rep) - + sizeof(size_type) - 1); + size_type __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep); const size_type __adj_size = __size + __malloc_header_size; if (__adj_size > __pagesize && __capacity > __old_capacity) @@ -584,14 +580,12 @@ namespace std // Never allocate a string bigger than _S_max_size. if (__capacity > _S_max_size) __capacity = _S_max_size; - __size = ((__capacity + 1) * sizeof(_CharT) + sizeof(_Rep) - + sizeof(size_type) - 1); + __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep); } // NB: Might throw, but no worries about a leak, mate: _Rep() // does not throw. - void* __place = _Raw_alloc(__alloc).allocate(__size - / sizeof(size_type)); + void* __place = _Raw_bytes_alloc(__alloc).allocate(__size); _Rep *__p = new (__place) _Rep; __p->_M_capacity = __capacity; return __p; diff --git a/libstdc++-v3/include/ext/array_allocator.h b/libstdc++-v3/include/ext/array_allocator.h index 27169193306..8689d9da26a 100644 --- a/libstdc++-v3/include/ext/array_allocator.h +++ b/libstdc++-v3/include/ext/array_allocator.h @@ -121,10 +121,9 @@ namespace __gnu_cxx allocate(size_type __n, const void* = 0) { static size_type __array_used; - if (_M_array == 0 - || __array_used + __n > sizeof(*_M_array) / sizeof(_Tp)) + if (_M_array == 0 || __array_used + __n > _M_array->size()) std::__throw_bad_alloc(); - pointer __ret = reinterpret_cast<_Tp*>(_M_array) + __array_used; + pointer __ret = _M_array->begin() + __array_used; __array_used += __n; return __ret; } diff --git a/libstdc++-v3/src/bitmap_allocator.cc b/libstdc++-v3/src/bitmap_allocator.cc index 4e42cced450..c8d94af2157 100644 --- a/libstdc++-v3/src/bitmap_allocator.cc +++ b/libstdc++-v3/src/bitmap_allocator.cc @@ -41,10 +41,6 @@ namespace __gnu_cxx ::_Alloc_block*, bitmap_allocator::_Alloc_block*> >; - template class __mini_vector::_Alloc_block*, - bitmap_allocator::_Alloc_block*> >; - template class __mini_vector; template size_t** __lower_bound diff --git a/libstdc++-v3/src/mt_allocator.cc b/libstdc++-v3/src/mt_allocator.cc index 9c94bc86044..bb6ab899caf 100644 --- a/libstdc++-v3/src/mt_allocator.cc +++ b/libstdc++-v3/src/mt_allocator.cc @@ -1,8 +1,8 @@ // Allocator details. -// Copyright (C) 2004, 2005 Free Software Foundation, Inc. +// Copyright (C) 2004 Free Software Foundation, Inc. // -// This file is part of the GNU ISO C++ Library. This library is free +// This file is part of the GNU ISO C++ Librarbooly. 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 2, or (at your option) @@ -552,5 +552,4 @@ namespace __gnu_cxx // Instantiations. template class __mt_alloc; template class __mt_alloc; - template class __mt_alloc; } // namespace __gnu_cxx diff --git a/libstdc++-v3/src/pool_allocator.cc b/libstdc++-v3/src/pool_allocator.cc index 1ad4e9c9a45..731cfffa0ea 100644 --- a/libstdc++-v3/src/pool_allocator.cc +++ b/libstdc++-v3/src/pool_allocator.cc @@ -170,5 +170,4 @@ namespace __gnu_cxx // Instantiations. template class __pool_alloc; template class __pool_alloc; - template class __pool_alloc; } // namespace __gnu_cxx diff --git a/libstdc++-v3/testsuite/ext/array_allocator/2.cc b/libstdc++-v3/testsuite/ext/array_allocator/2.cc index 1e837258923..f580ea250b7 100644 --- a/libstdc++-v3/testsuite/ext/array_allocator/2.cc +++ b/libstdc++-v3/testsuite/ext/array_allocator/2.cc @@ -1,4 +1,7 @@ -// Copyright (C) 2004, 2005 Free Software Foundation, Inc. +// Expected execution error for PR19495. +// { dg-do run { xfail powerpc*-*-linux* } } + +// Copyright (C) 2004 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 @@ -32,10 +35,7 @@ typedef char char_type; typedef std::char_traits traits_type; -// NB: Array_allocator doesn't properly support rebinding, used by -// basic_string. See libstdc++/21609 for details. -typedef std::tr1::array array_type; -typedef __gnu_cxx::array_allocator allocator_type; +typedef std::tr1::array array_type; array_type extern_array; @@ -44,8 +44,10 @@ void test01() bool test __attribute__((unused)) = true; using std::basic_string; + typedef __gnu_cxx::array_allocator allocator_type; typedef basic_string string_type; + size_t index = array_type::_S_index; allocator_type a(&extern_array); string_type s(a);