update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / include / pub_tool_libcassert.h

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_libcassert.h b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_libcassert.h
index af921128cefc1599412febac4f7d3edc7b7e8d5b..665ab0e18116bd78674cd08a735d537f0417b82d 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_libcassert.h
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/include/pub_tool_libcassert.h
@@ -32,7 +32,7 @@
 #define __PUB_TOOL_LIBCBASSERT_H
 
 #define tl_assert(expr)                                                 \
-  ((void) ((expr) ? 0 :                                                 \
+  ((void) (LIKELY(expr) ? 0 :                                           \
            (VG_(assert_fail) (/*isCore?*/False, (const Char*)#expr,     \
                               (const Char*)__FILE__, __LINE__,          \
                               (const Char*)__PRETTY_FUNCTION__,         \
@@ -40,7 +40,7 @@
                               0)))
 
 #define tl_assert2(expr, format, args...)                               \
-  ((void) ((expr) ? 0 :                                                 \
+  ((void) (LIKELY(expr) ? 0 :                                           \
            (VG_(assert_fail) (/*isCore?*/False, (const Char*)#expr,     \
                               (const Char*)__FILE__, __LINE__,          \
                               (const Char*)__PRETTY_FUNCTION__,         \