simplify this predicate, only checking isObjCQualifiedIdType once.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@53817 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index 0e1a8ee..52858cb 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -26,18 +26,23 @@
strcmp(typeName, "SEL") == 0 || strcmp(typeName, "Protocol") == 0;
}
+/// isObjCObjectPointerType - Returns true if type is an objective-c pointer
+/// to an object type; such as "id", "Class", Intf*, id<P>, etc.
bool Sema::isObjCObjectPointerType(QualType type) const {
- if (!type->isPointerType() && !type->isObjCQualifiedIdType())
+ if (type->isObjCQualifiedIdType())
+ return true;
+
+ if (!type->isPointerType())
return false;
- if (type == Context.getObjCIdType() || type == Context.getObjCClassType() ||
- type->isObjCQualifiedIdType())
+
+ if (type == Context.getObjCIdType() || type == Context.getObjCClassType())
return true;
if (type->isPointerType()) {
PointerType *pointerType = static_cast<PointerType*>(type.getTypePtr());
type = pointerType->getPointeeType();
}
- return (type->isObjCInterfaceType() || type->isObjCQualifiedIdType());
+ return type->isObjCInterfaceType() || type->isObjCQualifiedIdType();
}
void Sema::ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) {