diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 10 | ||||
| -rw-r--r-- | test/SemaObjC/compare-qualified-id.m | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 686a8f4008..a5066a8cd7 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -2182,7 +2182,15 @@ QualType Sema::CheckCompareOperands(Expr *&lex, Expr *&rex, SourceLocation loc, if ((lType->isObjCQualifiedIdType() || rType->isObjCQualifiedIdType())) { if (lType->isPointerType() || rType->isPointerType()) { - if (!Context.typesAreCompatible(lType, rType)) { + const PointerType *LPT = lType->getAsPointerType(); + const PointerType *RPT = rType->getAsPointerType(); + bool LPtrToVoid = LPT ? + Context.getCanonicalType(LPT->getPointeeType())->isVoidType() : false; + bool RPtrToVoid = RPT ? + Context.getCanonicalType(RPT->getPointeeType())->isVoidType() : false; + + if (!LPtrToVoid && !RPtrToVoid && + !Context.typesAreCompatible(lType, rType)) { Diag(loc, diag::ext_typecheck_comparison_of_distinct_pointers, lType.getAsString(), rType.getAsString(), lex->getSourceRange(), rex->getSourceRange()); diff --git a/test/SemaObjC/compare-qualified-id.m b/test/SemaObjC/compare-qualified-id.m index 91640669ae..1bcbd0edc0 100644 --- a/test/SemaObjC/compare-qualified-id.m +++ b/test/SemaObjC/compare-qualified-id.m @@ -26,7 +26,7 @@ extern NSString * const NSTaskDidTerminateNotification; @implementation XCPropertyExpansionContext - (NSString *)expandedValueForProperty:(NSString *)property { id <XCPropertyValues> cachedValueNode = [_propNamesToPropValuesCache objectForKey:property]; // expected-warning {{method '-objectForKey:' not found (return type defaults to 'id')}} - if (cachedValueNode == ((void *)0)) { } // expected-warning {{comparison of distinct pointer types ('id<XCPropertyValues>' and 'void *')}} + if (cachedValueNode == ((void *)0)) { } NSString * expandedValue = [cachedValueNode evaluateAsStringInContext:self withNestingState:((void *)0)]; return expandedValue; } |