fix warning, add a panic when irio imports vector modes

[libfirm] / ir / ir / irlinkednodeset.c

diff --git a/ir/ir/irlinkednodeset.c b/ir/ir/irlinkednodeset.c
index 0a04dd4..e9ab98d 100644 (file)
--- a/ir/ir/irlinkednodeset.c
+++ b/ir/ir/irlinkednodeset.c
@@ -40,11 +40,7 @@ static ir_lnk_nodeset_entry_t null_nodeset_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_nodeset_entry_t null_nodeset_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;
@@ -171,9 +166,7 @@ ir_node *ir_lnk_nodeset_iterator_next(ir_lnk_nodeset_iterator_t *iterator) {
  */
 void ir_lnk_nodeset_remove_iterator(ir_lnk_nodeset_t *nodeset,
                                     ir_lnk_nodeset_iterator_t *iterator) {
-       ir_lnk_nodeset_entry_t *rem = list_entry(iterator->iter, ir_lnk_nodeset_entry_t, list);
-
-       iterator->iter = rem->list.prev;
+       ir_lnk_nodeset_entry_t *rem = list_entry(iterator->iter->prev, ir_lnk_nodeset_entry_t, list);
 
        ir_lnk_nodeset_remove(nodeset, rem->node);
 }