summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Analysis/CFRefCount.cpp2
-rw-r--r--clang/lib/Frontend/PCHReaderDecl.cpp1
-rw-r--r--clang/lib/Frontend/PCHWriter.cpp1
-rw-r--r--clang/lib/Parse/AttributeList.cpp4
-rw-r--r--clang/lib/Sema/SemaDeclAttr.cpp5
5 files changed, 0 insertions, 13 deletions
diff --git a/clang/lib/Analysis/CFRefCount.cpp b/clang/lib/Analysis/CFRefCount.cpp
index 54843d534a4..976bfad188d 100644
--- a/clang/lib/Analysis/CFRefCount.cpp
+++ b/clang/lib/Analysis/CFRefCount.cpp
@@ -1113,8 +1113,6 @@ RetainSummaryManager::updateSummaryArgEffFromAnnotations(RetainSummary &Summ,
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
diff --git a/clang/lib/Frontend/PCHReaderDecl.cpp b/clang/lib/Frontend/PCHReaderDecl.cpp
index bed010d7da7..ff2eb9f7c92 100644
--- a/clang/lib/Frontend/PCHReaderDecl.cpp
+++ b/clang/lib/Frontend/PCHReaderDecl.cpp
@@ -477,7 +477,6 @@ Attr *PCHReader::ReadAttributes() {
SIMPLE_ATTR(ObjCNSObject);
SIMPLE_ATTR(CFOwnershipRelease);
SIMPLE_ATTR(CFOwnershipRetain);
- SIMPLE_ATTR(NSOwnershipMakeCollectable);
SIMPLE_ATTR(NSOwnershipRelease);
SIMPLE_ATTR(NSOwnershipRetain);
SIMPLE_ATTR(NSOwnershipReturns);
diff --git a/clang/lib/Frontend/PCHWriter.cpp b/clang/lib/Frontend/PCHWriter.cpp
index 2d4d8e44477..a1f0cb7f4fe 100644
--- a/clang/lib/Frontend/PCHWriter.cpp
+++ b/clang/lib/Frontend/PCHWriter.cpp
@@ -1551,7 +1551,6 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) {
case Attr::ObjCNSObject:
case Attr::CFOwnershipRelease:
case Attr::CFOwnershipRetain:
- case Attr::NSOwnershipMakeCollectable:
case Attr::NSOwnershipRelease:
case Attr::NSOwnershipRetain:
case Attr::NSOwnershipReturns:
diff --git a/clang/lib/Parse/AttributeList.cpp b/clang/lib/Parse/AttributeList.cpp
index c68a5b735bd..704d98a07e8 100644
--- a/clang/lib/Parse/AttributeList.cpp
+++ b/clang/lib/Parse/AttributeList.cpp
@@ -151,10 +151,6 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
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;
}
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index b29bcec1aa7..2cd9713a42f 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -1573,8 +1573,6 @@ static void HandleNSOwnershipAttr(Decl *d, const AttributeList &Attr,
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 @@ static void HandleNSOwnershipAttr(Decl *d, const AttributeList &Attr,
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 @@ static void ProcessDeclAttribute(Decl *D, const AttributeList &Attr, Sema &S) {
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;
OpenPOWER on IntegriCloud