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/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: