procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp.h (eassert): Don't use 'assume'.

Browse source 
Sometimes 'assume' wins in performance, and sometimes it loses,
so it shouldn't be used all the time.  Perhaps we need two
flavors of 'eassert', one for where 'assume' is far more likely
to help or to hurt; but that can be done later.
Problem reported by Dmitry Andipov in
<http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00276.html>.
Also, don't include <verify.h>; no longer needed.
This commit is contained in:
Paul Eggert 2013-10-09 10:52:38 -07:00
parent fa02290953
commit 0d5d30295a
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/ChangeLog
View file

@ -1,3 +1,14 @@
2013-10-09 Paul Eggert <eggert@cs.ucla.edu>
* lisp.h (eassert): Don't use 'assume'.
Sometimes 'assume' wins in performance, and sometimes it loses,
so it shouldn't be used all the time. Perhaps we need two
flavors of 'eassert', one for where 'assume' is far more likely
to help or to hurt; but that can be done later.
Problem reported by Dmitry Andipov in
<http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00276.html>.
Also, don't include <verify.h>; no longer needed.
2013-10-09 Glenn Morris <rgm@gnu.org>
* eval.c (Fcond): Doc tweak.

9
src/lisp.h
View file

@ -31,7 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <limits.h>
#include <intprops.h>
#include <verify.h>
INLINE_HEADER_BEGIN
@ -115,11 +114,9 @@ typedef EMACS_UINT uprintmax_t;
/* Extra internal type checking? */
/* Define an Emacs version of 'assert (COND)'. COND should be free of
side effects; it may be evaluated zero or more times. If COND is false,
Emacs reliably crashes if ENABLE_CHECKING is defined and behavior
is undefined if not. The compiler may assume COND while optimizing. */
side effects; it may be evaluated zero or more times. */
#ifndef ENABLE_CHECKING
# define eassert(cond) assume (cond)
# define eassert(cond) ((void) (0 && (cond))) /* Check that COND compiles. */
#else /* ENABLE_CHECKING */
extern _Noreturn void die (const char *, const char *, int);
@ -136,7 +133,7 @@ extern bool suppress_checking EXTERNALLY_VISIBLE;
# define eassert(cond) \
(suppress_checking || (cond) \
? assume (cond) \
? (void) 0 \
: die (# cond, __FILE__, __LINE__))
#endif /* ENABLE_CHECKING */