aboutsummaryrefslogtreecommitdiff
path: root/assert
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-08-12 03:41:23 +0000
committerUlrich Drepper <drepper@redhat.com>2003-08-12 03:41:23 +0000
commitca91553a6fc4c3689bf22c562af41f45566d8a77 (patch)
tree0348da7916cd7b85e6c2407d712907b6e82c19f0 /assert
parent334fcf2a65f3b58867ce136da767c6c58a3d45ed (diff)
downloadglibc-ca91553a6fc4c3689bf22c562af41f45566d8a77.tar
glibc-ca91553a6fc4c3689bf22c562af41f45566d8a77.tar.gz
glibc-ca91553a6fc4c3689bf22c562af41f45566d8a77.tar.bz2
glibc-ca91553a6fc4c3689bf22c562af41f45566d8a77.zip
Update.
2003-08-11 Ulrich Drepper <drepper@redhat.com> * assert/assert.h: Use __builtin_expect in assert and assert_perror definitions if possible.
Diffstat (limited to 'assert')
-rw-r--r--assert/assert.h23
1 files changed, 20 insertions, 3 deletions
diff --git a/assert/assert.h b/assert/assert.h
index 89e28b5453..9908d4176a 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1994-1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1994-2001,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -84,16 +84,33 @@ extern void __assert (const char *__assertion, const char *__file, int __line)
__END_DECLS
-# define assert(expr) \
+/* For the macro definition we use gcc's __builtin_expect if possible
+ to generate good code for the non-error case. gcc 3.0 is a good
+ enough estimate for when the feature became available. */
+# if __GNUC_PREREQ (3, 0)
+# define assert(expr) \
+ (__ASSERT_VOID_CAST (__builtin_expect (expr, 1) ? 0 : \
+ (__assert_fail (__STRING(expr), __FILE__, __LINE__, \
+ __ASSERT_FUNCTION), 0)))
+# else
+# define assert(expr) \
(__ASSERT_VOID_CAST ((expr) ? 0 : \
(__assert_fail (__STRING(expr), __FILE__, __LINE__, \
__ASSERT_FUNCTION), 0)))
+# endif
# ifdef __USE_GNU
-# define assert_perror(errnum) \
+# if __GNUC_PREREQ (3, 0)
+# define assert_perror(errnum) \
(__ASSERT_VOID_CAST (!(errnum) ? 0 : \
(__assert_perror_fail ((errnum), __FILE__, __LINE__, \
__ASSERT_FUNCTION), 0)))
+# else
+# define assert_perror(errnum) \
+ (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 : \
+ (__assert_perror_fail ((errnum), __FILE__, __LINE__, \
+ __ASSERT_FUNCTION), 0)))
+# endif
# endif
/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'