X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Flist.h;h=96e2f24695c221247686a3b3ffc7ddf727bc9805;hb=8bbd4f32bffc7cdd4ff37c05efea60ff64135edd;hp=f0dec5da60874c7cf9e6028589e9d1f03697816b;hpb=83c86e09a8d7610022eae49731ac1ed03ee4f67b;p=mesa.git

diff --git a/src/util/list.h b/src/util/list.h
index f0dec5da608..96e2f24695c 100644
--- a/src/util/list.h
+++ b/src/util/list.h
@@ -41,7 +41,13 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <assert.h>
+#include "c99_compat.h"
 
+#ifdef DEBUG
+#  define list_assert(cond, msg)  assert(cond && msg)
+#else
+#  define list_assert(cond, msg)  (void)(0 && (cond))
+#endif
 
 struct list_head
 {
@@ -71,12 +77,18 @@ static inline void list_addtail(struct list_head *item, struct list_head *list)
     list->prev = item;
 }
 
+static inline bool list_empty(const struct list_head *list);
+
 static inline void list_replace(struct list_head *from, struct list_head *to)
 {
-    to->prev = from->prev;
-    to->next = from->next;
-    from->next->prev = to;
-    from->prev->next = to;
+    if (list_empty(from)) {
+        list_inithead(to);
+    } else {
+        to->prev = from->prev;
+        to->next = from->next;
+        from->next->prev = to;
+        from->prev->next = to;
+    }
 }
 
 static inline void list_del(struct list_head *item)
@@ -94,7 +106,7 @@ static inline void list_delinit(struct list_head *item)
     item->prev = item;
 }
 
-static inline bool list_empty(struct list_head *list)
+static inline bool list_empty(const struct list_head *list)
 {
    return list->next == list;
 }
@@ -104,10 +116,10 @@ static inline bool list_empty(struct list_head *list)
  */
 static inline bool list_is_singular(const struct list_head *list)
 {
-   return list->next != NULL && list->next->next == list;
+   return list->next != NULL && list->next != list && list->next->next == list;
 }
 
-static inline unsigned list_length(struct list_head *list)
+static inline unsigned list_length(const struct list_head *list)
 {
    struct list_head *node;
    unsigned length = 0;
@@ -138,7 +150,7 @@ static inline void list_splicetail(struct list_head *src, struct list_head *dst)
    dst->prev = src->prev;
 }
 
-static inline void list_validate(struct list_head *list)
+static inline void list_validate(const struct list_head *list)
 {
    struct list_head *node;
    assert(list->next->prev == list && list->prev->next == list);
@@ -205,21 +217,27 @@ static inline void list_validate(struct list_head *list)
 	pos = container_of(pos->member.prev, pos, member))
 
 #define list_for_each_entry(type, pos, head, member)                    \
-   for (type *pos = LIST_ENTRY(type, (head)->next, member);             \
+   for (type *pos = LIST_ENTRY(type, (head)->next, member),             \
+	     *__next = LIST_ENTRY(type, pos->member.next, member);      \
 	&pos->member != (head);                                         \
-	pos = LIST_ENTRY(type, pos->member.next, member))
+	pos = LIST_ENTRY(type, pos->member.next, member),               \
+	list_assert(pos == __next, "use _safe iterator"),               \
+	__next = LIST_ENTRY(type, __next->member.next, member))
 
 #define list_for_each_entry_safe(type, pos, head, member)               \
    for (type *pos = LIST_ENTRY(type, (head)->next, member),             \
 	     *__next = LIST_ENTRY(type, pos->member.next, member);      \
 	&pos->member != (head);                                         \
 	pos = __next,                                                   \
-        __next = LIST_ENTRY(type, __next->member.next, member))
+	__next = LIST_ENTRY(type, __next->member.next, member))
 
 #define list_for_each_entry_rev(type, pos, head, member)                \
-   for (type *pos = LIST_ENTRY(type, (head)->prev, member);             \
+   for (type *pos = LIST_ENTRY(type, (head)->prev, member),             \
+	     *__prev = LIST_ENTRY(type, pos->member.prev, member);      \
 	&pos->member != (head);                                         \
-	pos = LIST_ENTRY(type, pos->member.prev, member))
+	pos = LIST_ENTRY(type, pos->member.prev, member),               \
+	list_assert(pos == __prev, "use _safe iterator"),               \
+	__prev = LIST_ENTRY(type, __prev->member.prev, member))
 
 #define list_for_each_entry_safe_rev(type, pos, head, member)           \
    for (type *pos = LIST_ENTRY(type, (head)->prev, member),             \