aboutsummaryrefslogtreecommitdiff
path: root/gcc/system.h
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2004-08-28 14:23:07 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2004-08-28 14:23:07 +0000
commit2c46a62f296a1e66c9438bba6a2c418698b831de (patch)
tree663b628a6a0d15570da75cfc5d5b2023025df395 /gcc/system.h
parent1f05db639b5c76eccc50a2a38835c1889df5385f (diff)
downloadgcc-2c46a62f296a1e66c9438bba6a2c418698b831de.zip
gcc-2c46a62f296a1e66c9438bba6a2c418698b831de.tar.gz
gcc-2c46a62f296a1e66c9438bba6a2c418698b831de.tar.bz2
system.h (gcc_assert): Remove __builtin_expect.
* system.h (gcc_assert): Remove __builtin_expect. Evaluate EXPR even when not checking. From-SVN: r86692
Diffstat (limited to 'gcc/system.h')
-rw-r--r--gcc/system.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/system.h b/gcc/system.h
index 934a332..191e1b1 100644
--- 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