diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 47 | ||||
| -rw-r--r-- | lib/Frontend/PCHReaderDecl.cpp | 1 | ||||
| -rw-r--r-- | lib/Frontend/PCHWriter.cpp | 1 | ||||
| -rw-r--r-- | lib/Parse/AttributeList.cpp | 1 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclAttr.cpp | 6 |
5 files changed, 36 insertions, 20 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 07dbf10c40..ca420006d2 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -779,8 +779,8 @@ public: RetainSummary* getCommonMethodSummary(const ObjCMethodDecl* MD, Selector S, QualType RetTy); - void updateSummaryArgEffFromAnnotations(RetainSummary &Summ, unsigned i, - const ParmVarDecl *PD); + void updateSummaryArgEffFromAnnotations(RetainSummary &Summ, const Decl *D, + unsigned argIdx = 0); void updateSummaryFromAnnotations(RetainSummary &Summ, const ObjCMethodDecl *MD); @@ -1097,22 +1097,32 @@ RetainSummaryManager::getInitMethodSummary(QualType RetTy) { // 'init' methods only return an alias if the return type is a location type. return getPersistentSummary(Loc::IsLocType(RetTy) ? RetEffect::MakeReceiverAlias() - : RetEffect::MakeNoRet()); + : RetEffect::MakeNoRet()); } - void RetainSummaryManager::updateSummaryArgEffFromAnnotations(RetainSummary &Summ, - unsigned i, - const ParmVarDecl *PD){ - if (PD->getAttr<NSOwnershipRetainAttr>()) - Summ.setArgEffect(AF, i, IncRefMsg); - else if (PD->getAttr<CFOwnershipRetainAttr>()) - Summ.setArgEffect(AF, i, IncRef); - else if (PD->getAttr<NSOwnershipReleaseAttr>()) - Summ.setArgEffect(AF, i, DecRefMsg); - else if (PD->getAttr<CFOwnershipReleaseAttr>()) - Summ.setArgEffect(AF, i, DecRef); + const Decl *D, + unsigned i) { + ArgEffect E = DoNothing; + + if (D->getAttr<NSOwnershipRetainAttr>()) + E = IncRefMsg; + else if (D->getAttr<CFOwnershipRetainAttr>()) + E = IncRef; + else if (D->getAttr<NSOwnershipReleaseAttr>()) + E = DecRefMsg; + else if (D->getAttr<CFOwnershipReleaseAttr>()) + E = DecRef; + else if (D->getAttr<NSOwnershipAutoreleaseAttr>()) + E = Autorelease; + else + return; + + if (isa<ParmVarDecl>(D)) + Summ.setArgEffect(AF, i, E); + else + Summ.setReceiverEffect(E); } void @@ -1137,7 +1147,7 @@ RetainSummaryManager::updateSummaryFromAnnotations(RetainSummary &Summ, unsigned i = 0; for (FunctionDecl::param_const_iterator I = FD->param_begin(), E = FD->param_end(); I != E; ++I, ++i) - updateSummaryArgEffFromAnnotations(Summ, i, *I); + updateSummaryArgEffFromAnnotations(Summ, *I, i); } void @@ -1162,13 +1172,10 @@ RetainSummaryManager::updateSummaryFromAnnotations(RetainSummary &Summ, unsigned i = 0; for (ObjCMethodDecl::param_iterator I = MD->param_begin(), E = MD->param_end(); I != E; ++I, ++i) - updateSummaryArgEffFromAnnotations(Summ, i, *I); + updateSummaryArgEffFromAnnotations(Summ, *I, i); // Determine any effects on the receiver. - if (MD->getAttr<NSOwnershipRetainAttr>()) - Summ.setReceiverEffect(IncRefMsg); - else if (MD->getAttr<NSOwnershipReleaseAttr>()) - Summ.setReceiverEffect(DecRefMsg); + updateSummaryArgEffFromAnnotations(Summ, MD); } RetainSummary* diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp index 7bcd296bce..059aa259c7 100644 --- a/lib/Frontend/PCHReaderDecl.cpp +++ b/lib/Frontend/PCHReaderDecl.cpp @@ -478,6 +478,7 @@ Attr *PCHReader::ReadAttributes() { SIMPLE_ATTR(CFOwnershipRelease); SIMPLE_ATTR(CFOwnershipRetain); SIMPLE_ATTR(CFOwnershipReturns); + SIMPLE_ATTR(NSOwnershipAutorelease); SIMPLE_ATTR(NSOwnershipRelease); SIMPLE_ATTR(NSOwnershipRetain); SIMPLE_ATTR(NSOwnershipReturns); diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp index 98ed063305..9b14a94fad 100644 --- a/lib/Frontend/PCHWriter.cpp +++ b/lib/Frontend/PCHWriter.cpp @@ -1552,6 +1552,7 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) { case Attr::CFOwnershipRelease: case Attr::CFOwnershipRetain: case Attr::CFOwnershipReturns: + case Attr::NSOwnershipAutorelease: case Attr::NSOwnershipRelease: case Attr::NSOwnershipRetain: case Attr::NSOwnershipReturns: diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp index 933e9f2b09..6dceda6432 100644 --- a/lib/Parse/AttributeList.cpp +++ b/lib/Parse/AttributeList.cpp @@ -129,6 +129,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) { break; case 15: if (!memcmp(Str, "ext_vector_type", 15)) return AT_ext_vector_type; + if (!memcmp(Str, "ns_autoreleases", 15)) return AT_ns_autoreleases; break; case 16: if (!memcmp(Str, "ns_returns_owned", 16)) return AT_ns_returns_owned; diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 926e5fda68..7701835b38 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -1595,6 +1595,8 @@ static void HandleNSOwnershipAttr(Decl *d, const AttributeList &Attr, name = "cf_releases"; break; case AttributeList::AT_cf_retains: name = "cf_retains"; break; + case AttributeList::AT_ns_autoreleases: + name = "ns_autoreleases"; break; case AttributeList::AT_ns_releases: name = "ns_releases"; break; case AttributeList::AT_ns_retains: @@ -1617,6 +1619,9 @@ static void HandleNSOwnershipAttr(Decl *d, const AttributeList &Attr, case AttributeList::AT_cf_retains: d->addAttr(::new (S.Context) CFOwnershipRetainAttr()); return; + case AttributeList::AT_ns_autoreleases: + d->addAttr(::new (S.Context) NSOwnershipAutoreleaseAttr()); + return; case AttributeList::AT_ns_releases: d->addAttr(::new (S.Context) NSOwnershipReleaseAttr()); return; @@ -1667,6 +1672,7 @@ static void ProcessDeclAttribute(Decl *D, const AttributeList &Attr, Sema &S) { case AttributeList::AT_cf_releases: case AttributeList::AT_cf_retains: HandleNSOwnershipAttr(D, Attr, S); break; + case AttributeList::AT_ns_autoreleases: case AttributeList::AT_ns_releases: case AttributeList::AT_ns_retains: HandleNSOwnershipAttr(D, Attr, S, true); break; |