system.h (gcc_assert): Remove __builtin_expect.

	* system.h (gcc_assert): Remove __builtin_expect.  Evaluate EXPR
	even when not checking.

From-SVN: r86692

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 74a6b13be1663eb0a22793c7956adf64feabb589..6eb15ca7570ed8a8e247137c5f3ec536e5d251e4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-28  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * system.h (gcc_assert): Remove __builtin_expect.  Evaluate EXPR
+       even when not checking.
+
 2004-08-27  Jason Merrill  <jason@redhat.com>
 
        PR c++/13684

diff --git a/gcc/system.h b/gcc/system.h
index 934a332162ff9a6e40d9e07991b1b11240339a52..191e1b102c628641f0d699ed2290d77a78c5535e 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -508,10 +508,10 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
 /* Use gcc_assert(EXPR) to test invariants.  */
 #if ENABLE_ASSERT_CHECKING
 #define gcc_assert(EXPR)                                               \
-   ((void)(__builtin_expect (!(EXPR), 0)                               \
-          ? fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0 : 0))
+   ((void)(!(EXPR) ? fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0 : 0))
 #else
-#define gcc_assert(EXPR) ((void)0)
+/* Include EXPR, so that unused variable warnings do not occur.  */
+#define gcc_assert(EXPR) ((void)(0 && (EXPR)))
 #endif
 
 /* Use gcc_unreachable() to mark unreachable locations (like an