commit 7ee9752b2f79d54cbf2f8b1f36d239380b0799cd
author sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Mon May 09 21:45:04 2011 +0000
committer sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Mon May 09 21:45:04 2011 +0000
tree 082202543a2af52d1d0365425f9063ef394c1b60
parent cd2b02533dd26037669406203677b10aa08eef70

Add LIKELY/UNLIKELY macros for general use, replacing s390x-specific
versions.  See #271504.  (Florian Krohm, britzel@acm.org)



git-svn-id: svn://svn.valgrind.org/vex/trunk@2150 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/main_util.h

diff --git a/priv/main_util.h b/priv/main_util.h
index ca63d8c..32afb7e 100644
--- a/priv/main_util.h
+++ b/priv/main_util.h
@@ -43,13 +43,15 @@
 
 #define NULL ((void*)0)
 
+#define LIKELY(x)       __builtin_expect(!!(x), 1)
+#define UNLIKELY(x)     __builtin_expect(!!(x), 0)
 
 /* Stuff for panicking and assertion. */
 
 #define VG__STRING(__str)  #__str
 
 #define vassert(expr)                                           \
-  ((void) ((expr) ? 0 :                                         \
+  ((void) (LIKELY(expr) ? 0 :                                   \
            (vex_assert_fail (VG__STRING(expr),                  \
                              __FILE__, __LINE__,                \
                              __PRETTY_FUNCTION__), 0)))