[cfe-commits] r45283 - in /cfe/trunk: AST/ASTContext.cpp test/Sema/objc-comptypes-4.m

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Dec 21 11:34:43 2007
New Revision: 45283

URL: http://llvm.org/viewvc/llvm-project?rev=45283&view=rev
Log:
Patch to compare to objective-c static types where one or the other
(but not both) may be a protocol qualified static type.

Added:
    cfe/trunk/test/Sema/objc-comptypes-4.m
Modified:
    cfe/trunk/AST/ASTContext.cpp

Modified: cfe/trunk/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/ASTContext.cpp?rev=45283&r1=45282&r2=45283&view=diff

==============================================================================
--- cfe/trunk/AST/ASTContext.cpp (original)
+++ cfe/trunk/AST/ASTContext.cpp Fri Dec 21 11:34:43 2007
@@ -1225,12 +1225,27 @@
   return lBuiltin->getKind() == rBuiltin->getKind();
 }
 
-
+/// objcTypesAreCompatible - This routine is called when two types
+/// are of different class; one is interface type or is 
+/// a qualified interface type and the other type is of a different class.
+/// Example, II or II<P>. 
 bool ASTContext::objcTypesAreCompatible(QualType lhs, QualType rhs) {
   if (lhs->isObjcInterfaceType() && isObjcIdType(rhs))
     return true;
   else if (isObjcIdType(lhs) && rhs->isObjcInterfaceType())
     return true;
+  if (ObjcInterfaceType *lhsIT = 
+      dyn_cast<ObjcInterfaceType>(lhs.getCanonicalType().getTypePtr())) {
+    ObjcQualifiedInterfaceType *rhsQI = 
+      dyn_cast<ObjcQualifiedInterfaceType>(rhs.getCanonicalType().getTypePtr());
+    return rhsQI && (lhsIT->getDecl() == rhsQI->getDecl());
+  }
+  else if (ObjcInterfaceType *rhsIT = 
+           dyn_cast<ObjcInterfaceType>(rhs.getCanonicalType().getTypePtr())) {
+    ObjcQualifiedInterfaceType *lhsQI = 
+    dyn_cast<ObjcQualifiedInterfaceType>(lhs.getCanonicalType().getTypePtr());
+    return lhsQI && (rhsIT->getDecl() == lhsQI->getDecl());
+  }
   return false;
 }
 

Added: cfe/trunk/test/Sema/objc-comptypes-4.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/objc-comptypes-4.m?rev=45283&view=auto

==============================================================================
--- cfe/trunk/test/Sema/objc-comptypes-4.m (added)
+++ cfe/trunk/test/Sema/objc-comptypes-4.m Fri Dec 21 11:34:43 2007
@@ -0,0 +1,25 @@
+// RUN: clang -fsyntax-only -verify %s
+
+extern void foo();
+
+ at protocol MyProtocol @end
+
+ at interface MyClass @end
+
+int main()
+{
+  MyClass <MyProtocol> *obj_p;
+  MyClass *obj_cp;
+
+  obj_cp = obj_p;  
+  obj_p = obj_cp;
+
+  if (obj_cp == obj_p)
+    foo();
+
+  if (obj_p == obj_cp)
+    foo();
+
+}
+
+