[cfe-commits] r70942 - in /cfe/branches/Apple/Dib: 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
Mike Stump
mrs at apple.com
Mon May 4 16:59:31 PDT 2009
Author: mrs
Date: Mon May 4 18:59:30 2009
New Revision: 70942
URL: http://llvm.org/viewvc/llvm-project?rev=70942&view=rev
Log:
Merge in 70940:
Remove experimental attribute 'ns_ownership_make_collectable.'
Modified:
cfe/branches/Apple/Dib/include/clang/AST/Attr.h
cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h
cfe/branches/Apple/Dib/lib/Analysis/CFRefCount.cpp
cfe/branches/Apple/Dib/lib/Frontend/PCHReaderDecl.cpp
cfe/branches/Apple/Dib/lib/Frontend/PCHWriter.cpp
cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp
cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp
cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m
Modified: cfe/branches/Apple/Dib/include/clang/AST/Attr.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/include/clang/AST/Attr.h?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/include/clang/AST/Attr.h (original)
+++ cfe/branches/Apple/Dib/include/clang/AST/Attr.h Mon May 4 18:59:30 2009
@@ -61,7 +61,6 @@
ObjCNSObject,
CFOwnershipRelease, // Clang/Checker-specific.
CFOwnershipRetain, // Clang/Checker-specific.
- NSOwnershipMakeCollectable, // Clang/Checker-specific.
NSOwnershipRelease, // Clang/Checker-specific.
NSOwnershipRetain, // Clang/Checker-specific.
NSOwnershipReturns, // Clang/Checker-specific.
@@ -470,7 +469,6 @@
DEF_SIMPLE_ATTR(NSOwnershipRelease);
DEF_SIMPLE_ATTR(CFOwnershipRetain);
DEF_SIMPLE_ATTR(NSOwnershipRetain);
-DEF_SIMPLE_ATTR(NSOwnershipMakeCollectable);
DEF_SIMPLE_ATTR(NSOwnershipReturns);
#undef DEF_SIMPLE_ATTR
Modified: cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h (original)
+++ cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h Mon May 4 18:59:30 2009
@@ -78,7 +78,6 @@
AT_objc_exception,
AT_cf_ownership_release, // Clang-specific.
AT_cf_ownership_retain, // 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.
Modified: cfe/branches/Apple/Dib/lib/Analysis/CFRefCount.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Analysis/CFRefCount.cpp?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/lib/Analysis/CFRefCount.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Analysis/CFRefCount.cpp Mon May 4 18:59:30 2009
@@ -1113,8 +1113,6 @@
Summ.setArgEffect(AF, i, DecRefMsg);
else if (PD->getAttr<CFOwnershipReleaseAttr>())
Summ.setArgEffect(AF, i, DecRef);
- else if (PD->getAttr<NSOwnershipMakeCollectableAttr>())
- Summ.setArgEffect(AF, i, MakeCollectable);
}
void
Modified: cfe/branches/Apple/Dib/lib/Frontend/PCHReaderDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Frontend/PCHReaderDecl.cpp?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/lib/Frontend/PCHReaderDecl.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Frontend/PCHReaderDecl.cpp Mon May 4 18:59:30 2009
@@ -477,7 +477,6 @@
SIMPLE_ATTR(ObjCNSObject);
SIMPLE_ATTR(CFOwnershipRelease);
SIMPLE_ATTR(CFOwnershipRetain);
- SIMPLE_ATTR(NSOwnershipMakeCollectable);
SIMPLE_ATTR(NSOwnershipRelease);
SIMPLE_ATTR(NSOwnershipRetain);
SIMPLE_ATTR(NSOwnershipReturns);
Modified: cfe/branches/Apple/Dib/lib/Frontend/PCHWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Frontend/PCHWriter.cpp?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/lib/Frontend/PCHWriter.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Frontend/PCHWriter.cpp Mon May 4 18:59:30 2009
@@ -1551,7 +1551,6 @@
case Attr::ObjCNSObject:
case Attr::CFOwnershipRelease:
case Attr::CFOwnershipRetain:
- case Attr::NSOwnershipMakeCollectable:
case Attr::NSOwnershipRelease:
case Attr::NSOwnershipRetain:
case Attr::NSOwnershipReturns:
Modified: cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp Mon May 4 18:59:30 2009
@@ -151,10 +151,6 @@
if (!memcmp(Str, "no_instrument_function", 22))
return AT_no_instrument_function;
break;
- case 29:
- if (!memcmp(Str, "ns_ownership_make_collectable", 29))
- return AT_ns_ownership_make_collectable;
- break;
}
return UnknownAttribute;
}
Modified: cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp Mon May 4 18:59:30 2009
@@ -1573,8 +1573,6 @@
name = "cf_ownership_release"; break;
case AttributeList::AT_cf_ownership_retain:
name = "cf_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:
@@ -1595,8 +1593,6 @@
d->addAttr(::new (S.Context) CFOwnershipReleaseAttr()); return;
case AttributeList::AT_cf_ownership_retain:
d->addAttr(::new (S.Context) CFOwnershipRetainAttr()); 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:
@@ -1645,7 +1641,6 @@
case AttributeList::AT_cf_ownership_release:
case AttributeList::AT_cf_ownership_retain:
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;
Modified: cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m?rev=70942&r1=70941&r2=70942&view=diff
==============================================================================
--- cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m (original)
+++ cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m Mon May 4 18:59:30 2009
@@ -134,7 +134,6 @@
- (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj;
- (void) myRelease:(id)__attribute__((ns_ownership_release))obj;
- (void) myCFRelease:(id)__attribute__((cf_ownership_release))obj;
-- (void) makeCollectable:(id)__attribute__((ns_ownership_make_collectable))obj;
@end
void test_attr_1(TestOwnershipAttr *X) {
@@ -189,7 +188,7 @@
void test_attr_6b(TestOwnershipAttr *X) {
CFMutableArrayRef A = CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // no-warning
- [X makeCollectable:(id)A];
+ CFMakeCollectable(A);
}
More information about the cfe-commits
mailing list