[analyzer] Ivar invalidation: track ivars declared in categories.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172168 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp b/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
index 80cb58d..527470a 100644
--- a/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/IvarInvalidationChecker.cpp
@@ -227,15 +227,23 @@
}
// If interface, check all parent protocols and super.
- // TODO: Visit all categories in case the invalidation method is declared in
- // a category.
- if (const ObjCInterfaceDecl *InterfaceD = dyn_cast<ObjCInterfaceDecl>(D)) {
+ if (const ObjCInterfaceDecl *InterfD = dyn_cast<ObjCInterfaceDecl>(D)) {
+
+ // Visit all protocols.
for (ObjCInterfaceDecl::protocol_iterator
- I = InterfaceD->protocol_begin(),
- E = InterfaceD->protocol_end(); I != E; ++I) {
+ I = InterfD->protocol_begin(),
+ E = InterfD->protocol_end(); I != E; ++I) {
containsInvalidationMethod(*I, OutInfo);
}
- containsInvalidationMethod(InterfaceD->getSuperClass(), OutInfo);
+
+ // Visit all categories in case the invalidation method is declared in
+ // a category.
+ for (const ObjCCategoryDecl *I = InterfD->getFirstClassExtension(); I;
+ I = I->getNextClassExtension()) {
+ containsInvalidationMethod(I, OutInfo);
+ }
+
+ containsInvalidationMethod(InterfD->getSuperClass(), OutInfo);
return;
}
@@ -249,7 +257,7 @@
return;
}
- llvm_unreachable("One of the casts above should have succeeded.");
+ return;
}
bool IvarInvalidationChecker::trackIvar(const ObjCIvarDecl *Iv,