diff options
-rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 5 | ||||
-rw-r--r-- | clang/test/SemaObjCXX/arc-ptr-comparison.mm | 24 |
2 files changed, 28 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 6144b5ac457..62863c25ebd 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9423,7 +9423,10 @@ QualType Sema::CheckCompareOperands(ExprResult &LHS, ExprResult &RHS, // If both operands are pointers, [...] bring them to their composite // pointer type. if ((int)LHSType->isPointerType() + (int)RHSType->isPointerType() >= - (IsRelational ? 2 : 1)) { + (IsRelational ? 2 : 1) && + (!LangOpts.ObjCAutoRefCount || + !(LHSType->isObjCObjectPointerType() || + RHSType->isObjCObjectPointerType()))) { if (convertPointersToCompositeType(*this, Loc, LHS, RHS)) return QualType(); else diff --git a/clang/test/SemaObjCXX/arc-ptr-comparison.mm b/clang/test/SemaObjCXX/arc-ptr-comparison.mm new file mode 100644 index 00000000000..8571a817959 --- /dev/null +++ b/clang/test/SemaObjCXX/arc-ptr-comparison.mm @@ -0,0 +1,24 @@ +// RUN: %clang_cc1 -std=c++11 -triple x86_64-apple-darwin11 -fsyntax-only -fobjc-arc -verify %s +// RUN: %clang_cc1 -std=c++11 -triple x86_64-apple-darwin11 -fsyntax-only -verify -DNOARC %s +#ifdef NOARC +// expected-no-diagnostics +#endif + +int testObjCComparisonRules(void *v, id x, id y) { + return v == x; +#ifndef NOARC +// expected-error@-2 {{implicit conversion of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} +// expected-note@-3 {{use __bridge to convert directly (no change in ownership)}} +// expected-note@-4 {{use __bridge_retained to make an ARC object available as a +1 'void *'}} +#endif + return v >= x; +#ifndef NOARC +// expected-error@-2 {{implicit conversion of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} +// expected-note@-3 {{use __bridge to convert directly (no change in ownership)}} +// expected-note@-4 {{use __bridge_retained to make an ARC object available as a +1 'void *'}} +#endif + return v == (id)(void *)0; // OK + return v == nullptr; // OK + return v == (void *)0; + return x == y; +} |