From: Ted Kremenek Date: Mon, 4 May 2009 17:29:57 +0000 (+0000) Subject: Rename attributes: X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31c215e62031b14e85c2f695c261817c044b465b;p=clang Rename attributes: 'objc_ownership_cfretain' -> 'cf_ownership_retain' 'objc_ownership_cfrelease' -> 'cf_ownership_release' Motivation: Core Foundation objects can be used in isolation from Objective-C, and this forces users to reason about the separate semantics of CF objects. More Sema support pending. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70884 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Attr.h b/include/clang/AST/Attr.h index cce69ca929..6d913de0a1 100644 --- a/include/clang/AST/Attr.h +++ b/include/clang/AST/Attr.h @@ -59,8 +59,8 @@ public: NonNull, ObjCException, ObjCNSObject, - ObjCOwnershipCFRelease, // Clang/Checker-specific. - ObjCOwnershipCFRetain, // Clang/Checker-specific. + CFOwnershipRelease, // Clang/Checker-specific. + CFOwnershipRetain, // Clang/Checker-specific. ObjCOwnershipMakeCollectable, // Clang/Checker-specific. ObjCOwnershipRelease, // Clang/Checker-specific. ObjCOwnershipRetain, // Clang/Checker-specific. @@ -466,9 +466,9 @@ public: }; // Checker-specific attributes. -DEF_SIMPLE_ATTR(ObjCOwnershipCFRelease); +DEF_SIMPLE_ATTR(CFOwnershipRelease); DEF_SIMPLE_ATTR(ObjCOwnershipRelease); -DEF_SIMPLE_ATTR(ObjCOwnershipCFRetain); +DEF_SIMPLE_ATTR(CFOwnershipRetain); DEF_SIMPLE_ATTR(ObjCOwnershipRetain); DEF_SIMPLE_ATTR(ObjCOwnershipMakeCollectable); DEF_SIMPLE_ATTR(ObjCOwnershipReturns); diff --git a/include/clang/Parse/AttributeList.h b/include/clang/Parse/AttributeList.h index 1528043196..5901fbd601 100644 --- a/include/clang/Parse/AttributeList.h +++ b/include/clang/Parse/AttributeList.h @@ -76,8 +76,8 @@ public: AT_nothrow, AT_nsobject, AT_objc_exception, - AT_objc_ownership_cfrelease, // Clang-specific. - AT_objc_ownership_cfretain, // Clang-specific. + AT_cf_ownership_release, // Clang-specific. + AT_cf_ownership_retain, // Clang-specific. AT_objc_ownership_make_collectable, // Clang-specific. AT_objc_ownership_release, // Clang-specific. AT_objc_ownership_retain, // Clang-specific. diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 711127b79d..f4b4b11853 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1107,11 +1107,11 @@ RetainSummaryManager::updateSummaryArgEffFromAnnotations(RetainSummary &Summ, const ParmVarDecl *PD){ if (PD->getAttr()) Summ.setArgEffect(AF, i, IncRefMsg); - else if (PD->getAttr()) + else if (PD->getAttr()) Summ.setArgEffect(AF, i, IncRef); else if (PD->getAttr()) Summ.setArgEffect(AF, i, DecRefMsg); - else if (PD->getAttr()) + else if (PD->getAttr()) Summ.setArgEffect(AF, i, DecRef); else if (PD->getAttr()) Summ.setArgEffect(AF, i, MakeCollectable); diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp index 22699e5716..29da2ab41d 100644 --- a/lib/Frontend/PCHReaderDecl.cpp +++ b/lib/Frontend/PCHReaderDecl.cpp @@ -475,8 +475,8 @@ Attr *PCHReader::ReadAttributes() { SIMPLE_ATTR(ObjCException); SIMPLE_ATTR(ObjCNSObject); - SIMPLE_ATTR(ObjCOwnershipCFRelease); - SIMPLE_ATTR(ObjCOwnershipCFRetain); + SIMPLE_ATTR(CFOwnershipRelease); + SIMPLE_ATTR(CFOwnershipRetain); SIMPLE_ATTR(ObjCOwnershipMakeCollectable); SIMPLE_ATTR(ObjCOwnershipRelease); SIMPLE_ATTR(ObjCOwnershipRetain); diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp index 2db93c3bb9..2bec9d4239 100644 --- a/lib/Frontend/PCHWriter.cpp +++ b/lib/Frontend/PCHWriter.cpp @@ -1549,8 +1549,8 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) { case Attr::ObjCException: case Attr::ObjCNSObject: - case Attr::ObjCOwnershipCFRelease: - case Attr::ObjCOwnershipCFRetain: + case Attr::CFOwnershipRelease: + case Attr::CFOwnershipRetain: case Attr::ObjCOwnershipMakeCollectable: case Attr::ObjCOwnershipRelease: case Attr::ObjCOwnershipRetain: diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp index cbd230cc51..a869601b47 100644 --- a/lib/Parse/AttributeList.cpp +++ b/lib/Parse/AttributeList.cpp @@ -133,6 +133,14 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) { case 18: if (!memcmp(Str, "warn_unused_result", 18)) return AT_warn_unused_result; break; + case 19: + if (!memcmp(Str, "cf_ownership_retain", 19)) + return AT_cf_ownership_retain; + break; + case 20: + if (!memcmp(Str, "cf_ownership_release", 20)) + return AT_cf_ownership_release; + break; case 21: if (!memcmp(Str, "objc_ownership_retain", 21)) return AT_objc_ownership_retain; @@ -145,14 +153,6 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) { if (!memcmp(Str, "no_instrument_function", 22)) return AT_no_instrument_function; break; - case 23: - if (!memcmp(Str, "objc_ownership_cfretain", 23)) - return AT_objc_ownership_cfretain; - break; - case 24: - if (!memcmp(Str, "objc_ownership_cfrelease", 24)) - return AT_objc_ownership_cfrelease; - break; case 31: if (!memcmp(Str, "objc_ownership_make_collectable", 31)) return AT_objc_ownership_make_collectable; diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 68d682ddab..9a26c913fb 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -1569,10 +1569,10 @@ static void HandleObjCOwnershipAttr(Decl *d, const AttributeList &Attr, default: assert(0 && "invalid ownership attribute"); return; - case AttributeList::AT_objc_ownership_cfrelease: - name = "objc_ownership_cfrelease"; break; - case AttributeList::AT_objc_ownership_cfretain: - name = "objc_ownership_cfretain"; break; + case AttributeList::AT_cf_ownership_release: + name = "cf_ownership_release"; break; + case AttributeList::AT_cf_ownership_retain: + name = "cf_ownership_retain"; break; case AttributeList::AT_objc_ownership_make_collectable: name = "objc_ownership_make_collectable"; break; case AttributeList::AT_objc_ownership_release: @@ -1591,10 +1591,10 @@ static void HandleObjCOwnershipAttr(Decl *d, const AttributeList &Attr, default: assert(0 && "invalid ownership attribute"); return; - case AttributeList::AT_objc_ownership_cfrelease: - d->addAttr(::new (S.Context) ObjCOwnershipCFReleaseAttr()); return; - case AttributeList::AT_objc_ownership_cfretain: - d->addAttr(::new (S.Context) ObjCOwnershipCFRetainAttr()); return; + case AttributeList::AT_cf_ownership_release: + d->addAttr(::new (S.Context) CFOwnershipReleaseAttr()); return; + case AttributeList::AT_cf_ownership_retain: + d->addAttr(::new (S.Context) CFOwnershipRetainAttr()); return; case AttributeList::AT_objc_ownership_make_collectable: d->addAttr(::new (S.Context) ObjCOwnershipMakeCollectableAttr()); return; case AttributeList::AT_objc_ownership_release: @@ -1642,8 +1642,8 @@ static void ProcessDeclAttribute(Decl *D, const AttributeList &Attr, Sema &S) { case AttributeList::AT_nothrow: HandleNothrowAttr (D, Attr, S); break; // Checker-specific. - case AttributeList::AT_objc_ownership_cfrelease: - case AttributeList::AT_objc_ownership_cfretain: + case AttributeList::AT_cf_ownership_release: + case AttributeList::AT_cf_ownership_retain: HandleObjCOwnershipAttr(D, Attr, S); break; case AttributeList::AT_objc_ownership_make_collectable: case AttributeList::AT_objc_ownership_release: diff --git a/test/Analysis/retain-release-gc-only.m b/test/Analysis/retain-release-gc-only.m index e008f4a795..3082b266c7 100644 --- a/test/Analysis/retain-release-gc-only.m +++ b/test/Analysis/retain-release-gc-only.m @@ -131,9 +131,9 @@ void f3() { @interface TestOwnershipAttr : NSObject - (NSString*) returnsAnOwnedString __attribute__((objc_ownership_returns)); - (void) myRetain:(id)__attribute__((objc_ownership_retain))obj; -- (void) myCFRetain:(id)__attribute__((objc_ownership_cfretain))obj; +- (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj; - (void) myRelease:(id)__attribute__((objc_ownership_release))obj; -- (void) myCFRelease:(id)__attribute__((objc_ownership_cfrelease))obj; +- (void) myCFRelease:(id)__attribute__((cf_ownership_release))obj; - (void) makeCollectable:(id)__attribute__((objc_ownership_make_collectable))obj; @end diff --git a/test/Analysis/retain-release.m b/test/Analysis/retain-release.m index 93d461329b..c0de303d21 100644 --- a/test/Analysis/retain-release.m +++ b/test/Analysis/retain-release.m @@ -433,9 +433,9 @@ 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) myCFRetain:(id)__attribute__((objc_ownership_cfretain))obj; +- (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj; - (void) myRelease:(id)__attribute__((objc_ownership_release))obj; -- (void) myCFRelease:(id)__attribute__((objc_ownership_cfrelease))obj; +- (void) myCFRelease:(id)__attribute__((cf_ownership_release))obj; - (void) myRetain __attribute__((objc_ownership_retain)); - (void) myRelease __attribute__((objc_ownership_release));