aboutsummaryrefslogtreecommitdiff
path: root/lib/Analysis/CFRefCount.cpp
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2008-10-22 20:54:52 +0000
committerTed Kremenek <kremenek@apple.com>2008-10-22 20:54:52 +0000
commit64e859a36634dfc848634d22aa428a48f82487d3 (patch)
tree782c4418a5dc0d99225a303b673b6c261349a9ae /lib/Analysis/CFRefCount.cpp
parent7692ed61098c216ca7d3ce9be744311e8eee90e4 (diff)
Enhance reference-count checker to correctly identify CG "release" functions. This fixes <rdar://problem/6303488>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57997 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Analysis/CFRefCount.cpp')
-rw-r--r--lib/Analysis/CFRefCount.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index acf4b568ed..db8a4598ba 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -704,8 +704,12 @@ RetainSummary* RetainSummaryManager::getSummary(FunctionDecl* FD) {
}
}
- if (FName[0] == 'C' && FName[1] == 'F')
- S = getCFSummary(FD, FName);
+ if (FName[0] == 'C') {
+ if (FName[1] == 'F')
+ S = getCFSummary(FD, FName);
+ else if (FName[1] == 'G')
+ S = getCGSummary(FD, FName);
+ }
else if (FName[0] == 'N' && FName[1] == 'S')
S = getNSSummary(FD, FName);
}
@@ -834,10 +838,14 @@ RetainSummary* RetainSummaryManager::getCFSummaryCreateRule(FunctionDecl* FD) {
FunctionType* FT =
dyn_cast<FunctionType>(FD->getType().getTypePtr());
-
- if (FT && !isCFRefType(FT->getResultType()))
- return getPersistentSummary(RetEffect::MakeNoRet());
+ if (FT) {
+ QualType ResTy = FT->getResultType();
+
+ if (!isCFRefType(ResTy) && !isCGRefType(ResTy))
+ return getPersistentSummary(RetEffect::MakeNoRet());
+ }
+
assert (ScratchArgs.empty());
if (FD->getIdentifier() == CFDictionaryCreateII) {