This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] libstdc++/19495
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Thu, 19 May 2005 00:14:43 +0200
- Subject: [v3] libstdc++/19495
Hi,
various versions tested on x86/x86_64/ia64-linux, committed to mainline.
If further testing goes well, a follow up will improve the memory usage
(on 64-bit machines, in particular).
Paolo.
////////////////
2005-05-18 Paolo Carlini <pcarlini@suse.de>
Nathan Myers <ncm@cantrip.org>
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.
diff -urN libstdc++-v3-orig/include/bits/basic_string.h libstdc++-v3/include/bits/basic_string.h
--- libstdc++-v3-orig/include/bits/basic_string.h 2005-04-25 12:59:21.000000000 +0200
+++ libstdc++-v3/include/bits/basic_string.h 2005-05-18 19:42:24.000000000 +0200
@@ -151,7 +151,7 @@
struct _Rep : _Rep_base
{
// Types:
- typedef typename _Alloc::template rebind<char>::other _Raw_bytes_alloc;
+ typedef typename _Alloc::template rebind<size_type>::other _Raw_alloc;
// (Public) Data members:
diff -urN libstdc++-v3-orig/include/bits/basic_string.tcc libstdc++-v3/include/bits/basic_string.tcc
--- libstdc++-v3-orig/include/bits/basic_string.tcc 2005-02-22 00:25:08.000000000 +0100
+++ libstdc++-v3/include/bits/basic_string.tcc 2005-05-18 19:42:24.000000000 +0200
@@ -425,9 +425,10 @@
basic_string<_CharT, _Traits, _Alloc>::_Rep::
_M_destroy(const _Alloc& __a) throw ()
{
- const size_type __size = sizeof(_Rep_base) +
- (this->_M_capacity + 1) * sizeof(_CharT);
- _Raw_bytes_alloc(__a).deallocate(reinterpret_cast<char*>(this), __size);
+ const size_type __size = ((this->_M_capacity + 1) * sizeof(_CharT)
+ + sizeof(_Rep_base) + sizeof(size_type) - 1);
+ _Raw_alloc(__a).deallocate(reinterpret_cast<size_type*>(this), __size
+ / sizeof(size_type));
}
template<typename _CharT, typename _Traits, typename _Alloc>
@@ -568,9 +569,12 @@
__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.
+ // 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).
// Whew. Seemingly so needy, yet so elemental.
- size_type __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
+ size_type __size = ((__capacity + 1) * sizeof(_CharT) + sizeof(_Rep)
+ + sizeof(size_type) - 1);
const size_type __adj_size = __size + __malloc_header_size;
if (__adj_size > __pagesize && __capacity > __old_capacity)
@@ -580,12 +584,14 @@
// 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);
+ __size = ((__capacity + 1) * sizeof(_CharT) + sizeof(_Rep)
+ + sizeof(size_type) - 1);
}
// NB: Might throw, but no worries about a leak, mate: _Rep()
// does not throw.
- void* __place = _Raw_bytes_alloc(__alloc).allocate(__size);
+ void* __place = _Raw_alloc(__alloc).allocate(__size
+ / sizeof(size_type));
_Rep *__p = new (__place) _Rep;
__p->_M_capacity = __capacity;
return __p;
diff -urN libstdc++-v3-orig/include/ext/array_allocator.h libstdc++-v3/include/ext/array_allocator.h
--- libstdc++-v3-orig/include/ext/array_allocator.h 2005-01-19 22:59:55.000000000 +0100
+++ libstdc++-v3/include/ext/array_allocator.h 2005-05-18 19:42:24.000000000 +0200
@@ -121,9 +121,10 @@
allocate(size_type __n, const void* = 0)
{
static size_type __array_used;
- if (_M_array == 0 || __array_used + __n > _M_array->size())
+ if (_M_array == 0
+ || __array_used + __n > sizeof(*_M_array) / sizeof(_Tp))
std::__throw_bad_alloc();
- pointer __ret = _M_array->begin() + __array_used;
+ pointer __ret = reinterpret_cast<_Tp*>(_M_array) + __array_used;
__array_used += __n;
return __ret;
}
diff -urN libstdc++-v3-orig/src/bitmap_allocator.cc libstdc++-v3/src/bitmap_allocator.cc
--- libstdc++-v3-orig/src/bitmap_allocator.cc 2005-04-15 06:07:45.000000000 +0200
+++ libstdc++-v3/src/bitmap_allocator.cc 2005-05-18 19:42:24.000000000 +0200
@@ -41,6 +41,10 @@
<bitmap_allocator<wchar_t>::_Alloc_block*,
bitmap_allocator<wchar_t>::_Alloc_block*> >;
+ template class __mini_vector<std::pair
+ <bitmap_allocator<size_t>::_Alloc_block*,
+ bitmap_allocator<size_t>::_Alloc_block*> >;
+
template class __mini_vector<size_t*>;
template size_t** __lower_bound
diff -urN libstdc++-v3-orig/src/mt_allocator.cc libstdc++-v3/src/mt_allocator.cc
--- libstdc++-v3-orig/src/mt_allocator.cc 2004-10-17 17:22:03.000000000 +0200
+++ libstdc++-v3/src/mt_allocator.cc 2005-05-18 19:42:45.000000000 +0200
@@ -1,8 +1,8 @@
// Allocator details.
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 Free Software Foundation, Inc.
//
-// This file is part of the GNU ISO C++ Librarbooly. This library is free
+// 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 2, or (at your option)
@@ -552,4 +552,5 @@
// Instantiations.
template class __mt_alloc<char>;
template class __mt_alloc<wchar_t>;
+ template class __mt_alloc<size_t>;
} // namespace __gnu_cxx
diff -urN libstdc++-v3-orig/src/pool_allocator.cc libstdc++-v3/src/pool_allocator.cc
--- libstdc++-v3-orig/src/pool_allocator.cc 2004-10-11 10:19:34.000000000 +0200
+++ libstdc++-v3/src/pool_allocator.cc 2005-05-18 19:42:24.000000000 +0200
@@ -170,4 +170,5 @@
// Instantiations.
template class __pool_alloc<char>;
template class __pool_alloc<wchar_t>;
+ template class __pool_alloc<size_t>;
} // namespace __gnu_cxx
diff -urN libstdc++-v3-orig/testsuite/ext/array_allocator/2.cc libstdc++-v3/testsuite/ext/array_allocator/2.cc
--- libstdc++-v3-orig/testsuite/ext/array_allocator/2.cc 2005-02-10 01:23:49.000000000 +0100
+++ libstdc++-v3/testsuite/ext/array_allocator/2.cc 2005-05-18 19:42:24.000000000 +0200
@@ -1,7 +1,4 @@
-// Expected execution error for PR19495.
-// { dg-do run { xfail powerpc*-*-linux* } }
-
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 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
@@ -35,7 +32,10 @@
typedef char char_type;
typedef std::char_traits<char_type> traits_type;
-typedef std::tr1::array<char_type, 32> array_type;
+// NB: Array_allocator doesn't properly support rebinding, used by
+// basic_string. See libstdc++/21609 for details.
+typedef std::tr1::array<size_t, 16> array_type;
+typedef __gnu_cxx::array_allocator<size_t, array_type> allocator_type;
array_type extern_array;
@@ -44,10 +44,8 @@
bool test __attribute__((unused)) = true;
using std::basic_string;
- typedef __gnu_cxx::array_allocator<char_type, array_type> allocator_type;
typedef basic_string<char_type, traits_type, allocator_type> string_type;
- size_t index = array_type::_S_index;
allocator_type a(&extern_array);
string_type s(a);