Avoid "variable might be clobbered by longjmp" warning.

tglsfdc · tglsfdc · commit 58bc48179b3c · 2013-03-28T13:19:49.000-04:00
On older-model gcc, the original coding of UTILITY_BEGIN_QUERY() can
draw this error because of multiple assignments to _needCleanup.
Rather than mark that variable volatile, we can suppress the warning
by arranging to have just one unconditional assignment before PG_TRY.
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
@@ -380,12 +380,9 @@ ProcessUtility(Node *parsetree,
  */
 #define UTILITY_BEGIN_QUERY(isComplete) \
 	do { \
-		bool		_needCleanup = false; \
+		bool		_needCleanup; \
 		\
-		if (isComplete) \
-		{ \
-			_needCleanup = EventTriggerBeginCompleteQuery(); \
-		} \
+		_needCleanup = (isComplete) && EventTriggerBeginCompleteQuery(); \
 		\
 		PG_TRY(); \
 		{ \
