From: Steve Naroff <snaroff@apple.com>
Date: Mon, 17 Nov 2008 19:49:16 +0000 (+0000)
Subject: Fix <rdar://problem/6316324> [sema] spurious warning on comparison of qualified id.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8069f102f1e7b67927be2e500ee1518e25aafbb;p=clang

Fix <rdar://problem/6316324> [sema] spurious warning on comparison of qualified id.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59459 91177308-0d34-0410-b5e6-96231b3b80d8
---

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;
 }