aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-10-30 18:39:13 +0000
committerDJ Delorie <dj@redhat.com>2003-10-30 18:39:13 +0000
commit686e72d729cf3ba9e15d5b9700d63c6a5bd88d21 (patch)
tree280641121146d5e6e1d9a2356741a4df16b283b6
parent0aa92b58af84bdd4b2c41e617e08cf48e4870db6 (diff)
downloadgdb-686e72d729cf3ba9e15d5b9700d63c6a5bd88d21.zip
gdb-686e72d729cf3ba9e15d5b9700d63c6a5bd88d21.tar.gz
gdb-686e72d729cf3ba9e15d5b9700d63c6a5bd88d21.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/hashtab.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6264fbf..34f421e 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-30 Josef Zlomek <zlomekj@suse.cz>
+
+ * hashtab.c (htab_find_slot_with_hash): Decrease n_deleted
+ instead of increasing n_elements when inserting to deleted slot.
+
2003-10-20 J. Brobecker <brobecker@gnat.com>
* cplus-dem.c (demangle_template): Register a new Btype only
diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c
index cbf8259..231fbc0 100644
--- a/libiberty/hashtab.c
+++ b/libiberty/hashtab.c
@@ -535,14 +535,14 @@ htab_find_slot_with_hash (htab, element, hash, insert)
if (insert == NO_INSERT)
return NULL;
- htab->n_elements++;
-
if (first_deleted_slot)
{
+ htab->n_deleted--;
*first_deleted_slot = EMPTY_ENTRY;
return first_deleted_slot;
}
+ htab->n_elements++;
return &htab->entries[index];
}