Use CMI_LIKELY in implementation of CmiEnforce/CmiAssert

charmplusplus · Jun 22, 2023 · 499ec24 · 499ec24
1 parent 14e398d
commit 499ec24
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/conv-core/converse.h b/src/conv-core/converse.h
@@ -1084,13 +1084,13 @@ void __CmiEnforceMsgHelper(const char* expr, const char* fileName,
 			   const char* lineNum, const char* msg, ...);
 
 #define CmiEnforce(expr)                                             \
-  ((void)((expr) ? 0                                                 \
+  ((void)(CMI_LIKELY(expr) ? 0                                       \
                  : (__CmiEnforceHelper(__CMK_STRING(expr), __FILE__, \
                                        __CMK_XSTRING(__LINE__)),     \
                     0)))
 
 #define CmiEnforceMsg(expr, ...)                                              \
-  ((void)((expr)                                                              \
+  ((void)(CMI_LIKELY(expr)                                                    \
               ? 0                                                             \
               : (__CmiEnforceMsgHelper(__CMK_STRING(expr), __FILE__,          \
                                        __CMK_XSTRING(__LINE__), __VA_ARGS__), \