Suppress more variable-set-but-not-used warnings from clang 15.

tglsfdc · tglsfdc · commit 850cb88e4b60 · 2022-09-21T13:52:38.000-04:00
Mop up assorted set-but-not-used warnings in the back branches. This includes back-patching relevant fixes from commit 152c9f7 the rest of the way, but there are also several cases that did not appear in HEAD. Some of those we'd fixed in a retail way but not back-patched, and others I think just got rewritten out of existence during nearby refactoring. While here, also back-patch b1980f6 (PL/Tcl: Fix compiler warnings with Tcl 8.6) into 9.2, so that that branch compiles warning-free with modern Tcl. Per project policy, this is a candidate for back-patching into out-of-support branches: it suppresses annoying compiler warnings but changes no behavior. Hence, back-patch all the way to 9.2. Discussion: https://postgr.es/m/514615.1663615243@sss.pgh.pa.us
diff --git a/contrib/hstore/crc32.c b/contrib/hstore/crc32.c
@@ -95,12 +95,10 @@ crc32_sz(char *buf, int size)
 {
 	unsigned int crc = ~((unsigned int) 0);
 	char	   *p;
-	int			len,
-				nr;
+	int			nr;
 
-	len = 0;
 	nr = size;
-	for (len += nr, p = buf; nr--; ++p)
+	for (p = buf; nr--; ++p)
 		_CRC32_(crc, *p);
 	return ~crc;
 }
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
@@ -103,12 +103,10 @@ ltree_crc32_sz(char *buf, int size)
 {
 	unsigned int crc = ~((unsigned int) 0);
 	char	   *p;
-	int			len,
-				nr;
+	int			nr;
 
-	len = 0;
 	nr = size;
-	for (len += nr, p = buf; nr--; ++p)
+	for (p = buf; nr--; ++p)
 		_CRC32_(crc, TOLOWER((unsigned int) *p));
 	return ~crc;
 }
diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
@@ -465,7 +465,6 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe
 	Page		rpage = BufferGetPage(rbuf);
 	Size		pageSize = PageGetPageSize(lpage);
 	Size		freeSpace;
-	uint32		nCopied = 1;
 
 	/* these must be static so they can be returned to caller */
 	static ginxlogSplit data;
@@ -485,15 +484,13 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe
 
 	if (GinPageIsLeaf(lpage) && GinPageRightMost(lpage) && off > GinPageGetOpaque(lpage)->maxoff)
 	{
-		nCopied = 0;
 		while (btree->curitem < btree->nitem &&
 			   maxoff * sizeof(ItemPointerData) < 2 * (freeSpace - sizeof(ItemPointerData)))
 		{
 			memcpy(vector + maxoff * sizeof(ItemPointerData),
 				   btree->items + btree->curitem,
 				   sizeof(ItemPointerData));
 			maxoff++;
-			nCopied++;
 			btree->curitem++;
 		}
 	}
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
@@ -784,16 +784,13 @@ flatten_join_alias_vars_mutator(Node *node,
 			RowExpr    *rowexpr;
 			List	   *fields = NIL;
 			List	   *colnames = NIL;
-			AttrNumber	attnum;
 			ListCell   *lv;
 			ListCell   *ln;
 
-			attnum = 0;
 			Assert(list_length(rte->joinaliasvars) == list_length(rte->eref->colnames));
 			forboth(lv, rte->joinaliasvars, ln, rte->eref->colnames)
 			{
 				newvar = (Node *) lfirst(lv);
-				attnum++;
 				/* Ignore dropped columns */
 				if (newvar == NULL)
 					continue;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -653,6 +653,7 @@ static void processCASbits(int cas_bits, int location, const char *constrType,
 stmtblock:	stmtmulti
 			{
 				pg_yyget_extra(yyscanner)->parsetree = $1;
+				(void) yynerrs;		/* suppress compiler warning */
 			}
 		;
 
diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c
@@ -216,7 +216,6 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
 {
 	ArrayAnalyzeExtraData *extra_data;
 	int			num_mcelem;
-	int			null_cnt = 0;
 	int			null_elem_cnt = 0;
 	int			analyzed_rows = 0;
 
@@ -321,8 +320,7 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
 		value = fetchfunc(stats, array_no, &isnull);
 		if (isnull)
 		{
-			/* array is null, just count that */
-			null_cnt++;
+			/* ignore arrays that are null overall */
 			continue;
 		}
 
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -3169,7 +3169,6 @@ text_to_array_internal(PG_FUNCTION_ARGS)
 		 * to search for occurrences of fldsep.
 		 */
 		TextPositionState state;
-		int			fldnum;
 		int			start_posn;
 		int			end_posn;
 		int			chunk_len;
@@ -3209,7 +3208,7 @@ text_to_array_internal(PG_FUNCTION_ARGS)
 		/* start_ptr points to the start_posn'th character of inputstring */
 		start_ptr = VARDATA_ANY(inputstring);
 
-		for (fldnum = 1;; fldnum++)		/* field number is 1 based */
+		for (;;)
 		{
 			CHECK_FOR_INTERRUPTS();
 
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
@@ -18,6 +18,11 @@
 #define CONST84
 #endif
 
+/* ... and for Tcl 8.6. */
+#ifndef CONST86
+#define CONST86
+#endif
+
 #include "access/xact.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
@@ -258,7 +263,7 @@ pltcl_FinalizeNotifier(ClientData clientData)
 }
 
 static void
-pltcl_SetTimer(Tcl_Time *timePtr)
+pltcl_SetTimer(CONST86 Tcl_Time *timePtr)
 {
 }
 
@@ -284,7 +289,7 @@ pltcl_ServiceModeHook(int mode)
 }
 
 static int
-pltcl_WaitForEvent(Tcl_Time *timePtr)
+pltcl_WaitForEvent(CONST86 Tcl_Time *timePtr)
 {
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,10 @@ crc32_sz(char *buf, int size)`
`95`	`95`	`{`
`96`	`96`	`unsigned int crc = ~((unsigned int) 0);`
`97`	`97`	`char *p;`
`98`		`- int len,`
`99`		`- nr;`
	`98`	`+ int nr;`
`100`	`99`
`101`		`- len = 0;`
`102`	`100`	`nr = size;`
`103`		`- for (len += nr, p = buf; nr--; ++p)`
	`101`	`+ for (p = buf; nr--; ++p)`
`104`	`102`	`_CRC32_(crc, *p);`
`105`	`103`	`return ~crc;`
`106`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,12 +103,10 @@ ltree_crc32_sz(char *buf, int size)`
`103`	`103`	`{`
`104`	`104`	`unsigned int crc = ~((unsigned int) 0);`
`105`	`105`	`char *p;`
`106`		`- int len,`
`107`		`- nr;`
	`106`	`+ int nr;`
`108`	`107`
`109`		`- len = 0;`
`110`	`108`	`nr = size;`
`111`		`- for (len += nr, p = buf; nr--; ++p)`
	`109`	`+ for (p = buf; nr--; ++p)`
`112`	`110`	`_CRC32_(crc, TOLOWER((unsigned int) *p));`
`113`	`111`	`return ~crc;`
`114`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,6 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe`
`465`	`465`	`Page rpage = BufferGetPage(rbuf);`
`466`	`466`	`Size pageSize = PageGetPageSize(lpage);`
`467`	`467`	`Size freeSpace;`
`468`		`- uint32 nCopied = 1;`
`469`	`468`
`470`	`469`	`/* these must be static so they can be returned to caller */`
`471`	`470`	`static ginxlogSplit data;`
`@@ -485,15 +484,13 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe`
`485`	`484`
`486`	`485`	`if (GinPageIsLeaf(lpage) && GinPageRightMost(lpage) && off > GinPageGetOpaque(lpage)->maxoff)`
`487`	`486`	`{`
`488`		`- nCopied = 0;`
`489`	`487`	`while (btree->curitem < btree->nitem &&`
`490`	`488`	`maxoff * sizeof(ItemPointerData) < 2 * (freeSpace - sizeof(ItemPointerData)))`
`491`	`489`	`{`
`492`	`490`	`memcpy(vector + maxoff * sizeof(ItemPointerData),`
`493`	`491`	`btree->items + btree->curitem,`
`494`	`492`	`sizeof(ItemPointerData));`
`495`	`493`	`maxoff++;`
`496`		`- nCopied++;`
`497`	`494`	`btree->curitem++;`
`498`	`495`	`}`
`499`	`496`	`}`
Original file line number	Diff line number	Diff line change
`@@ -653,6 +653,7 @@ static void processCASbits(int cas_bits, int location, const char *constrType,`
`653`	`653`	`stmtblock: stmtmulti`
`654`	`654`	`{`
`655`	`655`	`pg_yyget_extra(yyscanner)->parsetree = $1;`
	`656`	`+ (void) yynerrs; /* suppress compiler warning */`
`656`	`657`	`}`
`657`	`658`	`;`
`658`	`659`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,6 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,`
`216`	`216`	`{`
`217`	`217`	`ArrayAnalyzeExtraData *extra_data;`
`218`	`218`	`int num_mcelem;`
`219`		`- int null_cnt = 0;`
`220`	`219`	`int null_elem_cnt = 0;`
`221`	`220`	`int analyzed_rows = 0;`
`222`	`221`
`@@ -321,8 +320,7 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,`
`321`	`320`	`value = fetchfunc(stats, array_no, &isnull);`
`322`	`321`	`if (isnull)`
`323`	`322`	`{`
`324`		`- /* array is null, just count that */`
`325`		`- null_cnt++;`
	`323`	`+ /* ignore arrays that are null overall */`
`326`	`324`	`continue;`
`327`	`325`	`}`
`328`	`326`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@`
`18`	`18`	`#define CONST84`
`19`	`19`	`#endif`
`20`	`20`
	`21`	`+/* ... and for Tcl 8.6. */`
	`22`	`+#ifndef CONST86`
	`23`	`+#define CONST86`
	`24`	`+#endif`
	`25`	`+`
`21`	`26`	`#include "access/xact.h"`
`22`	`27`	`#include "catalog/pg_proc.h"`
`23`	`28`	`#include "catalog/pg_type.h"`
`@@ -258,7 +263,7 @@ pltcl_FinalizeNotifier(ClientData clientData)`
`258`	`263`	`}`
`259`	`264`
`260`	`265`	`static void`
`261`		`-pltcl_SetTimer(Tcl_Time *timePtr)`
	`266`	`+pltcl_SetTimer(CONST86 Tcl_Time *timePtr)`
`262`	`267`	`{`
`263`	`268`	`}`
`264`	`269`
`@@ -284,7 +289,7 @@ pltcl_ServiceModeHook(int mode)`
`284`	`289`	`}`
`285`	`290`
`286`	`291`	`static int`
`287`		`-pltcl_WaitForEvent(Tcl_Time *timePtr)`
	`292`	`+pltcl_WaitForEvent(CONST86 Tcl_Time *timePtr)`
`288`	`293`	`{`
`289`	`294`	`return 0;`
`290`	`295`	`}`