summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2012-11-30 21:15:20 +0000
committerAaron Ballman <aaron@aaronballman.com>2012-11-30 21:15:20 +0000
commit56b226a8da7b6f2a7464c4199d458abee550d879 (patch)
tree6e346c53b1bf36f65b6519a4b3376f72475f05e9
parent299fc29a59f7f301a1f33092c2ffab1ab22b67dc (diff)
downloadbcm5719-llvm-56b226a8da7b6f2a7464c4199d458abee550d879.tar.gz
bcm5719-llvm-56b226a8da7b6f2a7464c4199d458abee550d879.zip
Fixing an MSVC warning about an unsafe mixture of Boolean and unsigned types in a logical operator.
llvm-svn: 169037
-rw-r--r--clang/lib/CodeGen/CGExpr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index e709e729b35..ac6925f784a 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -1950,7 +1950,7 @@ llvm::Constant *CodeGenFunction::EmitCheckTypeDescriptor(QualType T) {
if (T->isIntegerType()) {
TypeKind = 0;
TypeInfo = (llvm::Log2_32(getContext().getTypeSize(T)) << 1) |
- T->isSignedIntegerType();
+ T->isSignedIntegerType() ? 1 : 0;
} else if (T->isFloatingType()) {
TypeKind = 1;
TypeInfo = getContext().getTypeSize(T);
OpenPOWER on IntegriCloud