From 686e72d729cf3ba9e15d5b9700d63c6a5bd88d21 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 30 Oct 2003 18:39:13 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/hashtab.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 6264fbf5a0b..34f421e1949 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2003-10-30 Josef Zlomek + + * 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 * cplus-dem.c (demangle_template): Register a new Btype only diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c index cbf82592be1..231fbc0dd7a 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]; } -- 2.30.2