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

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp
index cbd230cc51..a869601b47 100644
--- a/lib/Parse/AttributeList.cpp
+++ b/lib/Parse/AttributeList.cpp
@@ -133,6 +133,14 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
   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 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
     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;