diff options
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 13 | ||||
| -rw-r--r-- | lib/Parse/AttributeList.cpp | 2 | ||||
| -rw-r--r-- | test/Analysis/retain-release.m | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 9080e66876..bb957b89f5 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1095,7 +1095,18 @@ RetainSummaryManager::getMethodSummaryFromAnnotations(ObjCMethodDecl *MD) { } } - if (!hasRetEffect) + // Determine if there are any arguments with a specific ArgEffect. + bool hasArgEffect = false; + unsigned i = 0; + for (ObjCMethodDecl::param_iterator I = MD->param_begin(), + E = MD->param_end(); I != E; ++I, ++i) { + if ((*I)->getAttr<ObjCOwnershipRetainAttr>()) { + ScratchArgs.push_back(std::make_pair(i, IncRefMsg)); + hasArgEffect = true; + } +} + + if (!hasRetEffect && !hasArgEffect) return 0; return getPersistentSummary(RE); diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp index a205c0468a..8048db887d 100644 --- a/lib/Parse/AttributeList.cpp +++ b/lib/Parse/AttributeList.cpp @@ -135,7 +135,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) { break; case 21: if (!memcmp(Str, "objc_ownership_retain", 21)) - return AT_objc_ownership_returns; + return AT_objc_ownership_retain; case 22: if (!memcmp(Str, "objc_ownership_returns", 22)) return AT_objc_ownership_returns; diff --git a/test/Analysis/retain-release.m b/test/Analysis/retain-release.m index 0de2025398..ae1b75c216 100644 --- a/test/Analysis/retain-release.m +++ b/test/Analysis/retain-release.m @@ -411,7 +411,7 @@ void rdar6704930(unsigned char *s, unsigned int length) { @interface TestOwnershipAttr : NSObject - (NSString*) returnsAnOwnedString __attribute__((objc_ownership_returns)); -- (void) myRetain:(id __attribute__((objc_ownership_retain)))obj; +- (void) myRetain:(id)__attribute__((objc_ownership_retain))obj; @end void test_attr_1(TestOwnershipAttr *X) { @@ -419,7 +419,7 @@ void test_attr_1(TestOwnershipAttr *X) { } void test_attr_2(TestOwnershipAttr *X) { - NSString *str = [X returnsAnOwnedString]; // no-warning (yet) + NSString *str = [X returnsAnOwnedString]; // expected-warning{{leak}} [X myRetain:str]; [str release]; } |