Thread

[PATCH v2] gin: change remaining StaticAssertStmt() to StaticAssertDecl()

Bertrand Drouvot <bertranddrouvot.pg@gmail.com> — 2026-04-13T10:29:11Z

d50c86e74375 added a comment mentioning that StaticAssertStmt is deprecated
but 6f5ad00ab763 made use of it.

Fixing by replacing the StaticAssertStmt() by StaticAssertDecl(). Adding
a comment to make it clear that this is connected to palloc0_array().
Add new braces to avoid warning from -Wdeclaration-after-statement.

Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Reviewed-by: Peter Eisentraut <peter@eisentraut.org>
Discussion: https://postgr.es/m/2a2f9cb0-f00d-413c-8517-4a3ad220d104%40eisentraut.org
---
 src/backend/access/gin/ginutil.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 100.0% src/backend/access/gin/

diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index d3351fbe8a3..76d162075a9 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -534,8 +534,11 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum,
 	/*
 	 * Create GinNullCategory representation.
 	 */
-	StaticAssertStmt(GIN_CAT_NORM_KEY == 0, "Assuming GIN_CAT_NORM_KEY=0");
-	categories = palloc0_array(GinNullCategory, nentries + (hasNull ? 1 : 0));
+	{
+		/* Using palloc0_array requires GIN_CAT_NORM_KEY==0 */
+		StaticAssertDecl(GIN_CAT_NORM_KEY == 0, "Assuming GIN_CAT_NORM_KEY=0");
+		categories = palloc0_array(GinNullCategory, nentries + (hasNull ? 1 : 0));
+	}
 
 	/* Put back a NULL entry, if there were any */
 	if (hasNull)
-- 
2.34.1


--own3bwUg9UcwGn6A--