diff options
| -rw-r--r-- | lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp | 12 | ||||
| -rw-r--r-- | test/Analysis/retain-release-cf-audited.m | 33 |
2 files changed, 39 insertions, 6 deletions
diff --git a/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp b/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp index 3edc997503..856463a981 100644 --- a/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp +++ b/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp @@ -1133,12 +1133,7 @@ RetainSummaryManager::getFunctionSummary(const FunctionDecl *FD) { if (S) break; - if (RetTy->isPointerType()) { - if (FD->getAttr<CFAuditedTransferAttr>()) { - S = getCFCreateGetRuleSummary(FD); - break; - } - + if (RetTy->isPointerType()) { // For CoreFoundation ('CF') types. if (cocoa::isRefType(RetTy, "CF", FName)) { if (isRetain(FD, FName)) @@ -1169,6 +1164,11 @@ RetainSummaryManager::getFunctionSummary(const FunctionDecl *FD) { break; } + if (FD->getAttr<CFAuditedTransferAttr>()) { + S = getCFCreateGetRuleSummary(FD); + break; + } + break; } diff --git a/test/Analysis/retain-release-cf-audited.m b/test/Analysis/retain-release-cf-audited.m new file mode 100644 index 0000000000..c89172f70b --- /dev/null +++ b/test/Analysis/retain-release-cf-audited.m @@ -0,0 +1,33 @@ +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -analyze -analyzer-checker=core,osx.cocoa.RetainCount -verify %s +// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -analyze -analyzer-checker=core,osx.cocoa.RetainCount -verify %s -x objective-c++ + +// The special thing about this file is that CFRetain and CFRelease are marked +// as cf_audited_transfer. + +#pragma clang arc_cf_code_audited begin +typedef const void * CFTypeRef; +extern CFTypeRef CFRetain(CFTypeRef cf); +extern void CFRelease(CFTypeRef cf); + +extern CFTypeRef CFCreateSomethingAudited(); +#pragma clang arc_cf_code_audited end + +extern CFTypeRef CFCreateSomethingUnaudited(); + +void testAudited() { + CFTypeRef obj = CFCreateSomethingAudited(); // no-warning + CFRelease(obj); // no-warning + + CFTypeRef obj2 = CFCreateSomethingAudited(); // expected-warning{{leak}} + CFRetain(obj2); // no-warning + CFRelease(obj2); // no-warning +} + +void testUnaudited() { + CFTypeRef obj = CFCreateSomethingUnaudited(); // no-warning + CFRelease(obj); // no-warning + + CFTypeRef obj2 = CFCreateSomethingUnaudited(); // expected-warning{{leak}} + CFRetain(obj2); // no-warning + CFRelease(obj2); // no-warning +} |