]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Suppress variable-set-but-not-used warnings from clang 15.
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 20 Sep 2022 16:04:37 +0000 (12:04 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 20 Sep 2022 16:04:37 +0000 (12:04 -0400)
clang 15+ will issue a set-but-not-used warning when the only
use of a variable is in autoincrements (e.g., "foo++;").
That's perfectly sensible, but it detects a few more cases that
we'd not noticed before.  Silence the warnings with our usual
methods, such as PG_USED_FOR_ASSERTS_ONLY, or in one case by
actually removing a useless variable.

One thing that we can't nicely get rid of is that with %pure-parser,
Bison emits "yynerrs" as a local variable that falls foul of this
warning.  To silence those, I inserted "(void) yynerrs;" in the
top-level productions of affected grammars.

Per recently-established 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 to 9.5, which is as far as these patches go without
issues.  (A preliminary check shows that the prior branches
need some other set-but-not-used cleanups too, so I'll leave
them for another day.)

Discussion: https://postgr.es/m/514615.1663615243@sss.pgh.pa.us

src/backend/access/gist/gistxlog.c
src/backend/access/transam/xlog.c
src/backend/parser/gram.y
src/backend/utils/adt/array_typanalyze.c
src/backend/utils/adt/jsonpath_gram.y
src/bin/pgbench/exprparse.y

index 3b28f546465d4a98fcda3411c07e9cd797cc2262..4daf3ba21243b8e444e1f08104dbaf36c785f66b 100644 (file)
@@ -81,7 +81,7 @@ gistRedoPageUpdateRecord(XLogReaderState *record)
                char       *begin;
                char       *data;
                Size            datalen;
-               int                     ninserted = 0;
+               int                     ninserted PG_USED_FOR_ASSERTS_ONLY = 0;
 
                data = begin = XLogRecGetBlockData(record, 0, &datalen);
 
index 443ee90b5a1a5c7d878497af3d580af6a3c8219d..36e077045b9c2dfbb2331618ff00986c706e074e 100644 (file)
@@ -2106,7 +2106,7 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
        XLogRecPtr      NewPageEndPtr = InvalidXLogRecPtr;
        XLogRecPtr      NewPageBeginPtr;
        XLogPageHeader NewPage;
-       int                     npages = 0;
+       int                     npages pg_attribute_unused() = 0;
 
        LWLockAcquire(WALBufMappingLock, LW_EXCLUSIVE);
 
index 9de9dbd8a8a50dad5a4014915996f31700948dd2..e820606338c1f5dc74fd6b473596c798c36e1619 100644 (file)
@@ -789,6 +789,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 stmtblock:     stmtmulti
                        {
                                pg_yyget_extra(yyscanner)->parsetree = $1;
+                               (void) yynerrs;         /* suppress compiler warning */
                        }
                ;
 
index eafb94b697e3985f270e1705ad7e36fbeb68b908..f8fd6cb8cb564903fc12d0af731e8d324f8f7859 100644 (file)
@@ -218,7 +218,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;
 
@@ -322,8 +321,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;
                }
 
index 99a995d0b1c78b63deba95ee21c6fa63350b6cfc..7ecbd918595c48448d655090328a48ccdd7f0659 100644 (file)
@@ -128,6 +128,7 @@ result:
                                                                                *result = palloc(sizeof(JsonPathParseResult));
                                                                                (*result)->expr = $2;
                                                                                (*result)->lax = $1;
+                                                                               (void) yynerrs;
                                                                        }
        | /* EMPTY */                                   { *result = NULL; }
        ;
index 17c9ec32c50d5621450989736e875427fa05fab5..250064c23be62692ad0c3b9d67feecb5066b9f97 100644 (file)
@@ -79,7 +79,10 @@ static PgBenchExpr *make_case(yyscan_t yyscanner, PgBenchExprList *when_then_lis
 
 %%
 
-result: expr                           { expr_parse_result = $1; }
+result: expr                           {
+                                                               expr_parse_result = $1;
+                                                               (void) yynerrs; /* suppress compiler warning */
+                                                       }
 
 elist:                                         { $$ = NULL; }
        | expr                                  { $$ = make_elist($1, NULL); }