aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Analysis/CFRefCount.cpp14
-rw-r--r--lib/Frontend/PCHReaderDecl.cpp8
-rw-r--r--lib/Frontend/PCHWriter.cpp8
-rw-r--r--lib/Parse/AttributeList.cpp20
-rw-r--r--lib/Sema/SemaDeclAttr.cpp46
5 files changed, 47 insertions, 49 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index f4b4b11853..54843d534a 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1105,15 +1105,15 @@ void
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 @@ RetainSummaryManager::updateSummaryFromAnnotations(RetainSummary &Summ,
// 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 @@ RetainSummaryManager::updateSummaryFromAnnotations(RetainSummary &Summ,
// 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 @@ RetainSummaryManager::updateSummaryFromAnnotations(RetainSummary &Summ,
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);
}
diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp
index 29da2ab41d..bed010d7da 100644
--- a/lib/Frontend/PCHReaderDecl.cpp
+++ b/lib/Frontend/PCHReaderDecl.cpp
@@ -477,10 +477,10 @@ Attr *PCHReader::ReadAttributes() {
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);
diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp
index 2bec9d4239..2d4d8e4447 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -1551,10 +1551,10 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) {
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;
diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp
index a869601b47..c68a5b735b 100644
--- a/lib/Parse/AttributeList.cpp
+++ b/lib/Parse/AttributeList.cpp
@@ -136,26 +136,24 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
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;
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index 9a26c913fb..8aec8c8e07 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -1547,19 +1547,19 @@ static void HandleRegparmAttr(Decl *d, const AttributeList &Attr, Sema &S) {
// 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 @@ static void HandleObjCOwnershipAttr(Decl *d, const AttributeList &Attr,
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 @@ static void HandleObjCOwnershipAttr(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_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 @@ static void ProcessDeclAttribute(Decl *D, const AttributeList &Attr, Sema &S) {
// 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;
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-07-19 13:25:53 +0000