diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/system.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74a6b13..6eb15ca 100644 --- 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 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 |