From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Wed, 29 Aug 2012 23:28:45 +0000 (+0000)
Subject: Explicitly cast an expression to bool before handing it off to __builtin_expect.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d69a8c8b2133e441503ac9583c4a6056f52e0f3;p=oota-llvm.git

Explicitly cast an expression to bool before handing it off to __builtin_expect.

Avoids surprises when someone uses LLVM_(UN)LIKELY with an integer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@162877 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h
index 28e4cc6e966..4f5b8f82392 100644
--- a/include/llvm/Support/Compiler.h
+++ b/include/llvm/Support/Compiler.h
@@ -106,8 +106,8 @@
 #endif
 
 #if (__GNUC__ >= 4)
-#define LLVM_LIKELY(EXPR) __builtin_expect((EXPR), true)
-#define LLVM_UNLIKELY(EXPR) __builtin_expect((EXPR), false)
+#define LLVM_LIKELY(EXPR) __builtin_expect((bool)(EXPR), true)
+#define LLVM_UNLIKELY(EXPR) __builtin_expect((bool)(EXPR), false)
 #else
 #define LLVM_LIKELY(EXPR) (EXPR)
 #define LLVM_UNLIKELY(EXPR) (EXPR)