merge from gcc
This commit is contained in:
parent
64fb183974
commit
c4d8feb262
2 changed files with 22 additions and 3 deletions
|
@ -1,3 +1,9 @@
|
|||
2003-12-03 Jan Hubicka <jh@suse.cz>
|
||||
|
||||
* hashtab.c (htab_expand): Compute the size of hashtable based
|
||||
on the number of elements actually used.
|
||||
(htab_traverse): Call htab_expand when table is too empty.
|
||||
|
||||
2003-03-11 Carlo Wood <carlo@gnu.org>
|
||||
|
||||
* cplus-dem.c (demangle_integral_value): Correction to reflect
|
||||
|
|
|
@ -373,7 +373,14 @@ htab_expand (htab)
|
|||
oentries = htab->entries;
|
||||
olimit = oentries + htab->size;
|
||||
|
||||
nsize = higher_prime_number (htab->size * 2);
|
||||
/* Resize only when table after removal of unused elements is either
|
||||
too full or too empty. */
|
||||
if ((htab->n_elements - htab->n_deleted) * 2 > htab->size
|
||||
|| (htab->n_elements - htab->n_deleted) * 8 < htab->size
|
||||
&& htab->size > 32)
|
||||
nsize = higher_prime_number ((htab->n_elements - htab->n_deleted) * 2);
|
||||
else
|
||||
nsize = htab->size;
|
||||
|
||||
if (htab->alloc_with_arg_f != NULL)
|
||||
nentries = (PTR *) (*htab->alloc_with_arg_f) (htab->alloc_arg, nsize,
|
||||
|
@ -601,8 +608,14 @@ htab_traverse (htab, callback, info)
|
|||
htab_trav callback;
|
||||
PTR info;
|
||||
{
|
||||
PTR *slot = htab->entries;
|
||||
PTR *limit = slot + htab->size;
|
||||
PTR *slot;
|
||||
PTR *limit;
|
||||
|
||||
if ((htab->n_elements - htab->n_deleted) * 8 < htab->size)
|
||||
htab_expand (htab);
|
||||
|
||||
slot = htab->entries;
|
||||
limit = slot + htab->size;
|
||||
|
||||
do
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue