From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 21 Aug 2012 04:03:32 +0000 (-0400)
Subject: Teach compiler that ereport(>=ERROR) does not return
X-Git-Tag: REL9_3_BETA1~1052
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71450d7fd6c7cf7b3e38ac56e363bff6a681973c;p=postgresql

Teach compiler that ereport(>=ERROR) does not return

When elevel >= ERROR, we add an abort() call to the ereport() macro to
give the compiler a hint that the ereport() expansion will not return,
but the abort() isn't actually reached because the longjmp happens in
errfinish().

Because the effect of ereport() varies with the elevel, we cannot use
standard compiler attributes such as noreturn for this.
---

diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 1bbfd2b958..03298fbbaf 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -100,11 +100,16 @@
  * and have errstart insert the default text domain.  Modules can either use
  * ereport_domain() directly, or preferably they can override the TEXTDOMAIN
  * macro.
+ *
+ * When elevel >= ERROR, we add an abort() call to give the compiler a hint
+ * that the ereport() expansion will not return, but the abort() isn't actually
+ * reached because the longjmp happens in errfinish().
  *----------
  */
 #define ereport_domain(elevel, domain, rest)	\
 	(errstart(elevel, __FILE__, __LINE__, PG_FUNCNAME_MACRO, domain) ? \
-	 (errfinish rest) : (void) 0)
+	 (errfinish rest) : (void) 0),									   \
+		((elevel) >= ERROR ? abort() : (void) 0)
 
 #define ereport(elevel, rest)	\
 	ereport_domain(elevel, TEXTDOMAIN, rest)