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/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 711127b..f4b4b11 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1107,11 +1107,11 @@
const ParmVarDecl *PD){
if (PD->getAttr<ObjCOwnershipRetainAttr>())
Summ.setArgEffect(AF, i, IncRefMsg);
- else if (PD->getAttr<ObjCOwnershipCFRetainAttr>())
+ else if (PD->getAttr<CFOwnershipRetainAttr>())
Summ.setArgEffect(AF, i, IncRef);
else if (PD->getAttr<ObjCOwnershipReleaseAttr>())
Summ.setArgEffect(AF, i, DecRefMsg);
- else if (PD->getAttr<ObjCOwnershipCFReleaseAttr>())
+ else if (PD->getAttr<CFOwnershipReleaseAttr>())
Summ.setArgEffect(AF, i, DecRef);
else if (PD->getAttr<ObjCOwnershipMakeCollectableAttr>())
Summ.setArgEffect(AF, i, MakeCollectable);
diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp
index 22699e5..29da2ab 100644
--- a/lib/Frontend/PCHReaderDecl.cpp
+++ b/lib/Frontend/PCHReaderDecl.cpp
@@ -475,8 +475,8 @@
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 2db93c3..2bec9d4 100644
--- a/lib/Frontend/PCHWriter.cpp
+++ b/lib/Frontend/PCHWriter.cpp
@@ -1549,8 +1549,8 @@
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 cbd230c..a869601 100644
--- a/lib/Parse/AttributeList.cpp
+++ b/lib/Parse/AttributeList.cpp
@@ -133,6 +133,14 @@
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 @@
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 68d682d..9a26c91 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -1569,10 +1569,10 @@
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 @@
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 @@
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: