|
From: <sv...@va...> - 2014-07-25 08:38:11
|
Author: florian
Date: Fri Jul 25 08:38:02 2014
New Revision: 14191
Log:
Add LIKELY as suggested by Philippe.
Modified:
trunk/coregrind/m_aspacemgr/priv_aspacemgr.h
trunk/coregrind/m_libcbase.c
Modified: trunk/coregrind/m_aspacemgr/priv_aspacemgr.h
==============================================================================
--- trunk/coregrind/m_aspacemgr/priv_aspacemgr.h (original)
+++ trunk/coregrind/m_aspacemgr/priv_aspacemgr.h Fri Jul 25 08:38:02 2014
@@ -77,7 +77,7 @@
const HChar* fn );
#define aspacem_assert(expr) \
- ((void) ((expr) ? 0 : \
+ ((void) (LIKELY(expr) ? 0 : \
(ML_(am_assert_fail)(#expr, \
__FILE__, __LINE__, \
__PRETTY_FUNCTION__))))
Modified: trunk/coregrind/m_libcbase.c
==============================================================================
--- trunk/coregrind/m_libcbase.c (original)
+++ trunk/coregrind/m_libcbase.c Fri Jul 25 08:38:02 2014
@@ -35,11 +35,11 @@
/* ---------------------------------------------------------------------
- Assert machinery for use in this file. VG_(assert) cannot be called
+ Assert machinery for use in this file. vg_assert cannot be called
here due to cyclic dependencies.
------------------------------------------------------------------ */
#define libcbase_assert(expr) \
- ((void) ((expr) ? 0 : \
+ ((void) (LIKELY(expr) ? 0 : \
(ML_(libcbase_assert_fail)(#expr, \
__FILE__, __LINE__, \
__PRETTY_FUNCTION__))))
|