summaryrefslogtreecommitdiff
path: root/lib/Sema/SemaExpr.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2014-06-18 23:52:49 +0000
committerFariborz Jahanian <fjahanian@apple.com>2014-06-18 23:52:49 +0000
commit88a39adcf6cc703c363bcdf0ad979f2220e92ee9 (patch)
treebcabe494650b1699f4de9dda96023212defcc8dc /lib/Sema/SemaExpr.cpp
parent2e01479f1c4f2648a48dce00c007668fa4763d39 (diff)
downloadclang-88a39adcf6cc703c363bcdf0ad979f2220e92ee9.tar.gz
clang-88a39adcf6cc703c363bcdf0ad979f2220e92ee9.tar.bz2
clang-88a39adcf6cc703c363bcdf0ad979f2220e92ee9.tar.xz
Objective-C ARC. Allow conversion of (void*) pointers to
retainable ObjC pointers without requiring a bridge-cast in the context of pointer comparison as this is in effect a +0 context. // rdar://16627903 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211243 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaExpr.cpp')
-rw-r--r--lib/Sema/SemaExpr.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 4b4cb6c7c0..58a0c76769 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -8149,7 +8149,8 @@ QualType Sema::CheckCompareOperands(ExprResult &LHS, ExprResult &RHS,
else {
Expr *E = RHS.get();
if (getLangOpts().ObjCAutoRefCount)
- CheckObjCARCConversion(SourceRange(), LHSType, E, CCK_ImplicitConversion);
+ CheckObjCARCConversion(SourceRange(), LHSType, E, CCK_ImplicitConversion, false,
+ Opc);
RHS = ImpCastExprToType(E, LHSType,
LPT ? CK_BitCast :CK_CPointerToObjCPointerCast);
}