X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firlinkednodemap.c;h=1da579c9e01dd5d48be78aad12ae0e26d5aa2a96;hb=f250d98f949371038744bd320096fa98f4b218fe;hp=d3ce4922c78b24225628f32a414fc83ce80063a1;hpb=a45bb55ccc2bd1c781195b5ec2ee8ec73ab43c1b;p=libfirm

diff --git a/ir/ir/irlinkednodemap.c b/ir/ir/irlinkednodemap.c
index d3ce4922c..1da579c9e 100644
--- a/ir/ir/irlinkednodemap.c
+++ b/ir/ir/irlinkednodemap.c
@@ -40,11 +40,7 @@ static ir_lnk_nodemap_entry_t null_nodemap_entry;
 #define ConstKeyType              const ir_node*
 #define GetKey(value)             (value).node
 #define InitData(self,value,key)  do { (value).node = (key); (value).list.next = NULL; (value).list.prev = NULL; } while(0)
-#ifdef DEBUG_libfirm
 #define Hash(self,key)            ((unsigned)((key)->node_nr))
-#else
-#define Hash(self,key)            HASH_PTR(key)
-#endif
 #define KeysEqual(self,key1,key2) (key1) == (key2)
 #define SetRangeEmpty(ptr,size)   memset(ptr, 0, (size) * sizeof((ptr)[0]))
 #define EntrySetEmpty(value)      (value).node = NULL
@@ -72,10 +68,9 @@ static ir_lnk_nodemap_entry_t null_nodemap_entry;
  * Resize the hashset
  * @internal
  */
-static INLINE
+static
 void resize(HashSet *self, size_t new_size)
 {
-	size_t num_buckets = self->num_buckets;
 	HashSetEntry *old_entries = self->entries;
 	HashSetEntry *new_entries;
 	list_head    list = self->elem_list;
@@ -173,9 +168,7 @@ ir_node *ir_lnk_nodemap_iterator_next(ir_lnk_nodemap_iterator_t *iterator) {
  */
 void ir_lnk_nodemap_remove_iterator(ir_lnk_nodemap_t *nodemap,
                                     ir_lnk_nodemap_iterator_t *iterator) {
-	ir_lnk_nodemap_entry_t *rem = list_entry(iterator->iter, ir_lnk_nodemap_entry_t, list);
-
-	iterator->iter = rem->list.prev;
+	ir_lnk_nodemap_entry_t *rem = list_entry(iterator->iter->prev, ir_lnk_nodemap_entry_t, list);
 
 	ir_lnk_nodemap_remove(nodemap, rem->node);
 }