Improve handling of ereport(ERROR) and elog(ERROR).
In commit 71450d7fd6c7cf7b3e38ac56e363bff6a681973c, we added code to inform
suitably-intelligent compilers that ereport() doesn't return if the elevel
is ERROR or higher. This patch extends that to elog(), and also fixes a
double-evaluation hazard that the previous commit created in ereport(),
as well as reducing the emitted code size.
The elog() improvement requires the compiler to support __VA_ARGS__, which
should be available in just about anything nowadays since it's required by
C99. But our minimum language baseline is still C89, so add a configure
test for that.
The previous commit assumed that ereport's elevel could be evaluated twice,
which isn't terribly safe --- there are already counterexamples in xlog.c.
On compilers that have __builtin_constant_p, we can use that to protect the
second test, since there's no possible optimization gain if the compiler
doesn't know the value of elevel. Otherwise, use a local variable inside
the macros to prevent double evaluation. The local-variable solution is
inferior because (a) it leads to useless code being emitted when elevel
isn't constant, and (b) it increases the optimization level needed for the
compiler to recognize that subsequent code is unreachable. But it seems
better than not teaching non-gcc compilers about unreachability at all.
Lastly, if the compiler has __builtin_unreachable(), we can use that
instead of abort(), resulting in a noticeable code savings since no
function call is actually emitted. However, it seems wise to do this only
in non-assert builds. In an assert build, continue to use abort(), so that
the behavior will be predictable and debuggable if the "impossible"
happens.
These changes involve making the ereport and elog macros emit do-while
statement blocks not just expressions, which forces small changes in
a few call sites.
Andres Freund, Tom Lane, Heikki Linnakangas
Branch
------
master
Details
-------
http://git.postgresql.org/pg/commitdiff/b853eb97182079dcd30b4f52576bd5d6c275ee71
Modified Files
--------------
config/c-compiler.m4 | 59 ++++++++++-
configure | 178 ++++++++++++++++++++++++++++++++
configure.in | 3 +
contrib/cube/cubescan.l | 8 ++-
contrib/seg/segscan.l | 8 ++-
src/backend/bootstrap/bootscanner.l | 8 ++-
src/backend/parser/scan.l | 8 ++-
src/backend/replication/repl_scanner.l | 8 ++-
src/include/c.h | 12 ++
src/include/pg_config.h.in | 9 ++
src/include/pg_config.h.win32 | 9 ++
src/include/utils/elog.h | 66 ++++++++++--
12 files changed, 361 insertions(+), 15 deletions(-)
