maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

When updating the retain summary based on {cf,ns}_consumed attributes, 

be sure to consume the argument index that actually had the attribute
rather than always the first.  rdar://problem/9234108

llvm-svn: 128998
This commit is contained in:
John McCall 2011-04-06 09:02:12 +00:00
parent ce5d9aedb9
commit 3337ca5f95
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/StaticAnalyzer/Core/CFRefCount.cpp
View File

@ -1201,7 +1201,7 @@ RetainSummaryManager::updateSummaryFromAnnotations(RetainSummary &Summ,
// Effects on the parameters. // Effects on the parameters.
unsigned parm_idx = 0; unsigned parm_idx = 0;
for (FunctionDecl::param_const_iterator pi = FD->param_begin(), for (FunctionDecl::param_const_iterator pi = FD->param_begin(),
pe = FD->param_end(); pi != pe; ++pi) { pe = FD->param_end(); pi != pe; ++pi, ++parm_idx) {
const ParmVarDecl *pd = *pi; const ParmVarDecl *pd = *pi;
if (pd->getAttr<NSConsumedAttr>()) { if (pd->getAttr<NSConsumedAttr>()) {
if (!GCEnabled) if (!GCEnabled)

7
clang/test/Analysis/retain-release.m
View File

@ -1453,3 +1453,10 @@ static void rdar_8724287(CFErrorRef error)
} }
} }
// <rdar://problem/9234108> - Make sure the model applies cf_consumed
// correctly in argument positions besides the first.
extern void *CFStringCreate(void);
extern void rdar_9234108_helper(void *key, void * CF_CONSUMED value);
void rdar_9234108() {
rdar_9234108_helper(0, CFStringCreate());
}