[Emacs-diffs] trunk r113099: * alloc.c (die): Move "assertion failed" string here ...

[Paul Eggert]

------------------------------------------------------------
revno: 113099
revision-id: address@hidden
parent: address@hidden
author: Paul Eggert  <address@hidden>
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-20 07:47:46 -0700
message:
  * alloc.c (die): Move "assertion failed" string here ...
  
  * lisp.h (eassert): ... from here.  Also, suppress evaluation of
  COND when SUPPRESS_CHECKING.  This shrinks the executable text
  size by 0.8% to 2.2% when configured with --enable-checking,
  depending on optimization flags (GCC 4.8.1 x86-64).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-20 14:15:42 +0000
+++ b/src/ChangeLog     2013-06-20 14:47:46 +0000
@@ -1,5 +1,11 @@
 2013-06-20  Paul Eggert  <address@hidden>
 
+       * alloc.c (die): Move "assertion failed" string here ...
+       * lisp.h (eassert): ... from here.  Also, suppress evaluation of
+       COND when SUPPRESS_CHECKING.  This shrinks the executable text
+       size by 0.8% to 2.2% when configured with --enable-checking,
+       depending on optimization flags (GCC 4.8.1 x86-64).
+
        * floatfns.c (Flog10): Move to Lisp (marked obsolete there).
 
 2013-06-20  Rüdiger Sonderfeld <address@hidden>

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2013-06-17 06:03:19 +0000
+++ b/src/alloc.c       2013-06-20 14:47:46 +0000
@@ -6515,7 +6515,7 @@
 void
 die (const char *msg, const char *file, int line)
 {
-  fprintf (stderr, "\r\n%s:%d: Emacs fatal error: %s\r\n",
+  fprintf (stderr, "\r\n%s:%d: Emacs fatal error: assertion failed: %s\r\n",
           file, line, msg);
   terminate_due_to_signal (SIGABRT, INT_MAX);
 }

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-06-18 17:15:25 +0000
+++ b/src/lisp.h        2013-06-20 14:47:46 +0000
@@ -130,9 +130,9 @@
 extern bool suppress_checking EXTERNALLY_VISIBLE;
 
 # define eassert(cond)                                         \
-   ((cond) || suppress_checking                                        \
+   (suppress_checking || (cond)                                \
     ? (void) 0                                                 \
-    : die ("assertion failed: " # cond, __FILE__, __LINE__))
+    : die (# cond, __FILE__, __LINE__))
 #endif /* ENABLE_CHECKING */
 
 /* Use the configure flag --enable-check-lisp-object-type to make