objc rewriter: Fixes a rewriting of implicit casting of an integral
argument to bool. // rdar://9899834
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136946 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Rewrite/RewriteObjC.cpp b/lib/Rewrite/RewriteObjC.cpp
index 63e2084..3ba7e90 100644
--- a/lib/Rewrite/RewriteObjC.cpp
+++ b/lib/Rewrite/RewriteObjC.cpp
@@ -3008,7 +3008,11 @@
type = Context->getObjCIdType();
// Make sure we convert "type (^)(...)" to "type (*)(...)".
(void)convertBlockPointerToFunctionPointer(type);
- userExpr = NoTypeInfoCStyleCastExpr(Context, type, CK_BitCast,
+ const Expr *SubExpr = ICE->IgnoreParenImpCasts();
+ bool integral = SubExpr->getType()->isIntegralType(*Context);
+ userExpr = NoTypeInfoCStyleCastExpr(Context, type,
+ (integral && type->isBooleanType())
+ ? CK_IntegralToBoolean : CK_BitCast,
userExpr);
}
// Make id<P...> cast into an 'id' cast.