commit 76c4873e8cad2871d2d547318d371b9a89d8c806
author Ebrahim Byagowi <ebrahim@gnu.org> Fri Jun 02 21:53:10 2017 +0430
committer Behdad Esfahbod <behdad@behdad.org> Fri Jun 02 13:23:10 2017 -0400
tree 4dca5df5d4a9c41f999895628b17d35249b930e9
parent 7dba30639a6f62803dfc21706bc7c654799f373e

Support branch prediction helpers on clang compiles (#491)

src/hb-private.hh

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 3595ede..b5dccc5 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -74,10 +74,9 @@
 /* Compiler attributes */
 
 
-#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _HB_BOOLEAN_EXPR(expr) ((expr) ? 1 : 0)
-#define likely(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 1))
-#define unlikely(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 0))
+#if (defined(__GNUC__) || defined(__clang__)) && defined(__OPTIMIZE__)
+#define likely(expr) (__builtin_expect (!!(expr), 1))
+#define unlikely(expr) (__builtin_expect (!!(expr), 0))
 #else
 #define likely(expr) (expr)
 #define unlikely(expr) (expr)