From 60ca2e8418a14b531f684723d08639997afc0d6f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 1 Jun 2022 17:21:45 -0400 Subject: [PATCH] Silence compiler warnings from some older compilers. Since a117cebd6, some older gcc versions issue "variable may be used uninitialized in this function" complaints for brin_summarize_range. Silence that using the same coding pattern as in bt_index_check_internal; arguably, a117cebd6 had too narrow a view of which compilers might give trouble. Nathan Bossart and Tom Lane. Back-patch as the previous commit was. Discussion: https://postgr.es/m/20220601163537.GA2331988@nathanxps13 --- contrib/amcheck/verify_nbtree.c | 2 +- src/backend/access/brin/brin.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index 1017d5a26a..e857dc3add 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -280,7 +280,7 @@ bt_index_check_internal(Oid indrelid, bool parentcheck, bool heapallindexed, else { heaprel = NULL; - /* for "gcc -Og" https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394 */ + /* Set these just to suppress "uninitialized variable" warnings */ save_userid = InvalidOid; save_sec_context = -1; save_nestlevel = -1; diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c index 8906bc76fb..0becfde113 100644 --- a/src/backend/access/brin/brin.c +++ b/src/backend/access/brin/brin.c @@ -911,7 +911,13 @@ brin_summarize_range(PG_FUNCTION_ARGS) save_nestlevel = NewGUCNestLevel(); } else + { heapRel = NULL; + /* Set these just to suppress "uninitialized variable" warnings */ + save_userid = InvalidOid; + save_sec_context = -1; + save_nestlevel = -1; + } indexRel = index_open(indexoid, ShareUpdateExclusiveLock);