Fix ILIST_DEBUG build

anarazel · anarazel · commit 2b1620875377 · 2023-01-18T10:26:15.000-08:00
In c8ad4d8 dlist_member_check()'s arguments were made const. Unfortunately the implementation of dlist_member_check() used dlist_foreach(), which currently doesn't work for const lists. As a workaround, open-code the list iteration. The other check functions already do so. Discussion: https://postgr.es/m/20230118182214.co7dp4oahiunwg57@awork3.anarazel.de
diff --git a/src/backend/lib/ilist.c b/src/backend/lib/ilist.c
@@ -59,11 +59,12 @@ slist_delete(slist_head *head, const slist_node *node)
 void
 dlist_member_check(const dlist_head *head, const dlist_node *node)
 {
-	dlist_iter	iter;
+	const dlist_node *cur;
 
-	dlist_foreach(iter, head)
+	/* iteration open-coded to due to the use of const */
+	for (cur = head->head.next; cur != &head->head; cur = cur->next)
 	{
-		if (iter.cur == node)
+		if (cur == node)
 			return;
 	}
 	elog(ERROR, "double linked list member check failure");

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,12 @@ slist_delete(slist_head head, const slist_node node)`
`59`	`59`	`void`
`60`	`60`	`dlist_member_check(const dlist_head head, const dlist_node node)`
`61`	`61`	`{`
`62`		`- dlist_iter iter;`
	`62`	`+ const dlist_node *cur;`
`63`	`63`
`64`		`- dlist_foreach(iter, head)`
	`64`	`+ /* iteration open-coded to due to the use of const */`
	`65`	`+ for (cur = head->head.next; cur != &head->head; cur = cur->next)`
`65`	`66`	`{`
`66`		`- if (iter.cur == node)`
	`67`	`+ if (cur == node)`
`67`	`68`	`return;`
`68`	`69`	`}`
`69`	`70`	`elog(ERROR, "double linked list member check failure");`