[cfe-commits] r70897 - in /cfe/trunk: include/clang/AST/Attr.h include/clang/Parse/AttributeList.h lib/Analysis/CFRefCount.cpp lib/Frontend/PCHReaderDecl.cpp lib/Frontend/PCHWriter.cpp lib/Parse/AttributeList.cpp lib/Sema/SemaDeclAttr.cpp test/Analysis/retain-release-gc-only.m test/Analysis/retain-release.m
Ted Kremenek
kremenek at apple.com
Mon May 4 12:10:19 PDT 2009
Author: kremenek
Date: Mon May 4 14:10:19 2009
New Revision: 70897
URL: http://llvm.org/viewvc/llvm-project?rev=70897&view=rev
Log:
Rename attributes 'objc_ownership...' to 'ns_ownership...'.
Modified:
cfe/trunk/include/clang/AST/Attr.h
cfe/trunk/include/clang/Parse/AttributeList.h
cfe/trunk/lib/Analysis/CFRefCount.cpp
cfe/trunk/lib/Frontend/PCHReaderDecl.cpp
cfe/trunk/lib/Frontend/PCHWriter.cpp
cfe/trunk/lib/Parse/AttributeList.cpp
cfe/trunk/lib/Sema/SemaDeclAttr.cpp
cfe/trunk/test/Analysis/retain-release-gc-only.m
cfe/trunk/test/Analysis/retain-release.m
Modified: cfe/trunk/include/clang/AST/Attr.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Attr.h?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Attr.h (original)
+++ cfe/trunk/include/clang/AST/Attr.h Mon May 4 14:10:19 2009
@@ -61,10 +61,10 @@
ObjCNSObject,
CFOwnershipRelease, // Clang/Checker-specific.
CFOwnershipRetain, // Clang/Checker-specific.
- ObjCOwnershipMakeCollectable, // Clang/Checker-specific.
- ObjCOwnershipRelease, // Clang/Checker-specific.
- ObjCOwnershipRetain, // Clang/Checker-specific.
- ObjCOwnershipReturns, // Clang/Checker-specific.
+ NSOwnershipMakeCollectable, // Clang/Checker-specific.
+ NSOwnershipRelease, // Clang/Checker-specific.
+ NSOwnershipRetain, // Clang/Checker-specific.
+ NSOwnershipReturns, // Clang/Checker-specific.
Overloadable, // Clang-specific
Packed,
Pure,
@@ -467,11 +467,11 @@
// Checker-specific attributes.
DEF_SIMPLE_ATTR(CFOwnershipRelease);
-DEF_SIMPLE_ATTR(ObjCOwnershipRelease);
+DEF_SIMPLE_ATTR(NSOwnershipRelease);
DEF_SIMPLE_ATTR(CFOwnershipRetain);
-DEF_SIMPLE_ATTR(ObjCOwnershipRetain);
-DEF_SIMPLE_ATTR(ObjCOwnershipMakeCollectable);
-DEF_SIMPLE_ATTR(ObjCOwnershipReturns);
+DEF_SIMPLE_ATTR(NSOwnershipRetain);
+DEF_SIMPLE_ATTR(NSOwnershipMakeCollectable);
+DEF_SIMPLE_ATTR(NSOwnershipReturns);
#undef DEF_SIMPLE_ATTR
Modified: cfe/trunk/include/clang/Parse/AttributeList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/AttributeList.h?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/AttributeList.h (original)
+++ cfe/trunk/include/clang/Parse/AttributeList.h Mon May 4 14:10:19 2009
@@ -78,10 +78,10 @@
AT_objc_exception,
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.
- AT_objc_ownership_returns, // Clang-specific.
+ AT_ns_ownership_make_collectable, // Clang-specific.
+ AT_ns_ownership_release, // Clang-specific.
+ AT_ns_ownership_retain, // Clang-specific.
+ AT_ns_ownership_returns, // Clang-specific.
AT_objc_gc,
AT_overloadable, // Clang-specific.
AT_packed,
Modified: cfe/trunk/lib/Analysis/CFRefCount.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CFRefCount.cpp?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/CFRefCount.cpp (original)
+++ cfe/trunk/lib/Analysis/CFRefCount.cpp Mon May 4 14:10:19 2009
@@ -1105,15 +1105,15 @@
RetainSummaryManager::updateSummaryArgEffFromAnnotations(RetainSummary &Summ,
unsigned i,
const ParmVarDecl *PD){
- if (PD->getAttr<ObjCOwnershipRetainAttr>())
+ if (PD->getAttr<NSOwnershipRetainAttr>())
Summ.setArgEffect(AF, i, IncRefMsg);
else if (PD->getAttr<CFOwnershipRetainAttr>())
Summ.setArgEffect(AF, i, IncRef);
- else if (PD->getAttr<ObjCOwnershipReleaseAttr>())
+ else if (PD->getAttr<NSOwnershipReleaseAttr>())
Summ.setArgEffect(AF, i, DecRefMsg);
else if (PD->getAttr<CFOwnershipReleaseAttr>())
Summ.setArgEffect(AF, i, DecRef);
- else if (PD->getAttr<ObjCOwnershipMakeCollectableAttr>())
+ else if (PD->getAttr<NSOwnershipMakeCollectableAttr>())
Summ.setArgEffect(AF, i, MakeCollectable);
}
@@ -1125,7 +1125,7 @@
// Determine if there is a special return effect for this method.
if (isTrackedObjCObjectType(FD->getResultType())) {
- if (FD->getAttr<ObjCOwnershipReturnsAttr>()) {
+ if (FD->getAttr<NSOwnershipReturnsAttr>()) {
Summ.setRetEffect(isGCEnabled()
? RetEffect::MakeGCNotOwned()
: RetEffect::MakeOwned(RetEffect::ObjC, true));
@@ -1147,7 +1147,7 @@
// Determine if there is a special return effect for this method.
if (isTrackedObjCObjectType(MD->getResultType())) {
- if (MD->getAttr<ObjCOwnershipReturnsAttr>()) {
+ if (MD->getAttr<NSOwnershipReturnsAttr>()) {
Summ.setRetEffect(isGCEnabled()
? RetEffect::MakeGCNotOwned()
: RetEffect::MakeOwned(RetEffect::ObjC, true));
@@ -1161,9 +1161,9 @@
updateSummaryArgEffFromAnnotations(Summ, i, *I);
// Determine any effects on the receiver.
- if (MD->getAttr<ObjCOwnershipRetainAttr>())
+ if (MD->getAttr<NSOwnershipRetainAttr>())
Summ.setReceiverEffect(IncRefMsg);
- else if (MD->getAttr<ObjCOwnershipReleaseAttr>())
+ else if (MD->getAttr<NSOwnershipReleaseAttr>())
Summ.setReceiverEffect(DecRefMsg);
}
Modified: cfe/trunk/lib/Frontend/PCHReaderDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHReaderDecl.cpp?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHReaderDecl.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHReaderDecl.cpp Mon May 4 14:10:19 2009
@@ -477,10 +477,10 @@
SIMPLE_ATTR(ObjCNSObject);
SIMPLE_ATTR(CFOwnershipRelease);
SIMPLE_ATTR(CFOwnershipRetain);
- SIMPLE_ATTR(ObjCOwnershipMakeCollectable);
- SIMPLE_ATTR(ObjCOwnershipRelease);
- SIMPLE_ATTR(ObjCOwnershipRetain);
- SIMPLE_ATTR(ObjCOwnershipReturns);
+ SIMPLE_ATTR(NSOwnershipMakeCollectable);
+ SIMPLE_ATTR(NSOwnershipRelease);
+ SIMPLE_ATTR(NSOwnershipRetain);
+ SIMPLE_ATTR(NSOwnershipReturns);
SIMPLE_ATTR(Overloadable);
UNSIGNED_ATTR(Packed);
SIMPLE_ATTR(Pure);
Modified: cfe/trunk/lib/Frontend/PCHWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHWriter.cpp?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHWriter.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHWriter.cpp Mon May 4 14:10:19 2009
@@ -1551,10 +1551,10 @@
case Attr::ObjCNSObject:
case Attr::CFOwnershipRelease:
case Attr::CFOwnershipRetain:
- case Attr::ObjCOwnershipMakeCollectable:
- case Attr::ObjCOwnershipRelease:
- case Attr::ObjCOwnershipRetain:
- case Attr::ObjCOwnershipReturns:
+ case Attr::NSOwnershipMakeCollectable:
+ case Attr::NSOwnershipRelease:
+ case Attr::NSOwnershipRetain:
+ case Attr::NSOwnershipReturns:
case Attr::Overloadable:
break;
Modified: cfe/trunk/lib/Parse/AttributeList.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/AttributeList.cpp?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/AttributeList.cpp (original)
+++ cfe/trunk/lib/Parse/AttributeList.cpp Mon May 4 14:10:19 2009
@@ -136,26 +136,24 @@
case 19:
if (!memcmp(Str, "cf_ownership_retain", 19))
return AT_cf_ownership_retain;
+ if (!memcmp(Str, "ns_ownership_retain", 19))
+ return AT_ns_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;
+ if (!memcmp(Str, "ns_ownership_release", 20))
+ return AT_ns_ownership_release;
+ if (!memcmp(Str, "ns_ownership_returns", 20))
+ return AT_ns_ownership_returns;
break;
case 22:
- if (!memcmp(Str, "objc_ownership_returns", 22))
- return AT_objc_ownership_returns;
- if (!memcmp(Str, "objc_ownership_release", 22))
- return AT_objc_ownership_release;
if (!memcmp(Str, "no_instrument_function", 22))
return AT_no_instrument_function;
break;
- case 31:
- if (!memcmp(Str, "objc_ownership_make_collectable", 31))
- return AT_objc_ownership_make_collectable;
+ case 29:
+ if (!memcmp(Str, "ns_ownership_make_collectable", 29))
+ return AT_ns_ownership_make_collectable;
break;
}
return UnknownAttribute;
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Mon May 4 14:10:19 2009
@@ -1547,19 +1547,19 @@
// Checker-specific attribute handlers.
//===----------------------------------------------------------------------===//
-static void HandleObjCOwnershipReturnsAttr(Decl *d, const AttributeList &Attr,
+static void HandleNSOwnershipReturnsAttr(Decl *d, const AttributeList &Attr,
Sema &S) {
if (!isa<ObjCMethodDecl>(d) && !isa<FunctionDecl>(d)) {
S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) <<
- "objc_ownership_returns" << 3 /* function or method */;
+ "ns_ownership_returns" << 3 /* function or method */;
return;
}
- d->addAttr(::new (S.Context) ObjCOwnershipReturnsAttr());
+ d->addAttr(::new (S.Context) NSOwnershipReturnsAttr());
}
-static void HandleObjCOwnershipAttr(Decl *d, const AttributeList &Attr,
+static void HandleNSOwnershipAttr(Decl *d, const AttributeList &Attr,
Sema &S, bool attachToMethodDecl = false) {
if (!isa<ParmVarDecl>(d) && (!attachToMethodDecl || !isa<ObjCMethodDecl>(d))){
@@ -1573,12 +1573,12 @@
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:
- name = "objc_ownership_release"; break;
- case AttributeList::AT_objc_ownership_retain:
- name = "objc_ownership_retain"; break;
+ case AttributeList::AT_ns_ownership_make_collectable:
+ name = "ns_ownership_make_collectable"; break;
+ case AttributeList::AT_ns_ownership_release:
+ name = "ns_ownership_release"; break;
+ case AttributeList::AT_ns_ownership_retain:
+ name = "ns_ownership_retain"; break;
};
S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) << name
@@ -1595,12 +1595,12 @@
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:
- d->addAttr(::new (S.Context) ObjCOwnershipReleaseAttr()); return;
- case AttributeList::AT_objc_ownership_retain:
- d->addAttr(::new (S.Context) ObjCOwnershipRetainAttr()); return;
+ case AttributeList::AT_ns_ownership_make_collectable:
+ d->addAttr(::new (S.Context) NSOwnershipMakeCollectableAttr()); return;
+ case AttributeList::AT_ns_ownership_release:
+ d->addAttr(::new (S.Context) NSOwnershipReleaseAttr()); return;
+ case AttributeList::AT_ns_ownership_retain:
+ d->addAttr(::new (S.Context) NSOwnershipRetainAttr()); return;
}
}
@@ -1644,13 +1644,13 @@
// Checker-specific.
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:
- case AttributeList::AT_objc_ownership_retain:
- HandleObjCOwnershipAttr(D, Attr, S, true); break;
- case AttributeList::AT_objc_ownership_returns:
- HandleObjCOwnershipReturnsAttr(D, Attr, S); break;
+ HandleNSOwnershipAttr(D, Attr, S); break;
+ case AttributeList::AT_ns_ownership_make_collectable:
+ case AttributeList::AT_ns_ownership_release:
+ case AttributeList::AT_ns_ownership_retain:
+ HandleNSOwnershipAttr(D, Attr, S, true); break;
+ case AttributeList::AT_ns_ownership_returns:
+ HandleNSOwnershipReturnsAttr(D, Attr, S); break;
case AttributeList::AT_packed: HandlePackedAttr (D, Attr, S); break;
case AttributeList::AT_section: HandleSectionAttr (D, Attr, S); break;
Modified: cfe/trunk/test/Analysis/retain-release-gc-only.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/retain-release-gc-only.m?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/retain-release-gc-only.m (original)
+++ cfe/trunk/test/Analysis/retain-release-gc-only.m Mon May 4 14:10:19 2009
@@ -129,12 +129,12 @@
//===----------------------------------------------------------------------===//
@interface TestOwnershipAttr : NSObject
-- (NSString*) returnsAnOwnedString __attribute__((objc_ownership_returns));
-- (void) myRetain:(id)__attribute__((objc_ownership_retain))obj;
+- (NSString*) returnsAnOwnedString __attribute__((ns_ownership_returns));
+- (void) myRetain:(id)__attribute__((ns_ownership_retain))obj;
- (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj;
-- (void) myRelease:(id)__attribute__((objc_ownership_release))obj;
+- (void) myRelease:(id)__attribute__((ns_ownership_release))obj;
- (void) myCFRelease:(id)__attribute__((cf_ownership_release))obj;
-- (void) makeCollectable:(id)__attribute__((objc_ownership_make_collectable))obj;
+- (void) makeCollectable:(id)__attribute__((ns_ownership_make_collectable))obj;
@end
void test_attr_1(TestOwnershipAttr *X) {
Modified: cfe/trunk/test/Analysis/retain-release.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/retain-release.m?rev=70897&r1=70896&r2=70897&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/retain-release.m (original)
+++ cfe/trunk/test/Analysis/retain-release.m Mon May 4 14:10:19 2009
@@ -431,19 +431,19 @@
//===----------------------------------------------------------------------===//
@interface TestOwnershipAttr : NSObject
-- (NSString*) returnsAnOwnedString __attribute__((objc_ownership_returns));
-- (void) myRetain:(id)__attribute__((objc_ownership_retain))obj;
+- (NSString*) returnsAnOwnedString __attribute__((ns_ownership_returns));
+- (void) myRetain:(id)__attribute__((ns_ownership_retain))obj;
- (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj;
-- (void) myRelease:(id)__attribute__((objc_ownership_release))obj;
+- (void) myRelease:(id)__attribute__((ns_ownership_release))obj;
- (void) myCFRelease:(id)__attribute__((cf_ownership_release))obj;
-- (void) myRetain __attribute__((objc_ownership_retain));
-- (void) myRelease __attribute__((objc_ownership_release));
+- (void) myRetain __attribute__((ns_ownership_retain));
+- (void) myRelease __attribute__((ns_ownership_release));
@end
@interface TestAttrHelper : NSObject
- (NSString*) createString:(TestOwnershipAttr*)X;
-- (NSString*) createStringAttr:(TestOwnershipAttr*)X __attribute__((objc_ownership_returns));
+- (NSString*) createStringAttr:(TestOwnershipAttr*)X __attribute__((ns_ownership_returns));
@end
@implementation TestAttrHelper
More information about the cfe-commits
mailing list