clean up some logic in objc type handling. Specifically, make it so that

there are QualType::getAsObjc* type methods, and make isa<ObjCInterfaceType>
return true for ObjCQualifiedInterfaceType's.


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

1 files changed, 11 insertions, 10 deletions

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 265804872d..12eb5a15de 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1427,17 +1427,18 @@ bool ASTContext::objcTypesAreCompatible(QualType lhs, QualType 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());
+  
+  if (const ObjCInterfaceType *lhsIT = lhs->getAsObjCInterfaceType()) {
+    const ObjCQualifiedInterfaceType *rhsQI =
+      rhs->getAsObjCQualifiedInterfaceType();
+    if (!isa<ObjCQualifiedInterfaceType>(lhsIT))
+      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());
+  if (const ObjCInterfaceType *rhsIT = rhs->getAsObjCInterfaceType()) {
+    const ObjCQualifiedInterfaceType *lhsQI = 
+      lhs->getAsObjCQualifiedInterfaceType();
+    if (!isa<ObjCQualifiedInterfaceType>(rhsIT))
+      return lhsQI && (rhsIT->getDecl() == lhsQI->getDecl());
   }
   return false;
 }