[cfe-commits] r70975 - in /cfe/branches/Apple/Dib: include/clang/Parse/AttributeList.h lib/Parse/AttributeList.cpp lib/Sema/SemaDeclAttr.cpp test/Analysis/retain-release-gc-only.m test/Analysis/retain-release.m

[Mike Stump]

Author: mrs
Date: Tue May  5 10:04:13 2009
New Revision: 70975

URL: http://llvm.org/viewvc/llvm-project?rev=70975&view=rev
Log:
Merge in 70941:

Rename attribute 'ns_ownership_returns' to 'ns_returns_ownership'.

Modified:
    cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h
    cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp
    cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp
    cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m
    cfe/branches/Apple/Dib/test/Analysis/retain-release.m

Modified: cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h?rev=70975&r1=70974&r2=70975&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h (original)
+++ cfe/branches/Apple/Dib/include/clang/Parse/AttributeList.h Tue May  5 10:04:13 2009
@@ -80,7 +80,7 @@
     AT_cf_ownership_retain,         // Clang-specific.
     AT_ns_ownership_release,          // Clang-specific.
     AT_ns_ownership_retain,           // Clang-specific.
-    AT_ns_ownership_returns,          // Clang-specific.
+    AT_ns_returns_ownership,          // Clang-specific.
     AT_objc_gc,
     AT_overloadable,            // Clang-specific.
     AT_packed,

Modified: cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp?rev=70975&r1=70974&r2=70975&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Parse/AttributeList.cpp Tue May  5 10:04:13 2009
@@ -144,8 +144,8 @@
       return AT_cf_ownership_release;
     if (!memcmp(Str, "ns_ownership_release", 20))
       return AT_ns_ownership_release;
-    if (!memcmp(Str, "ns_ownership_returns", 20))
-      return AT_ns_ownership_returns;
+    if (!memcmp(Str, "ns_returns_ownership", 20))
+      return AT_ns_returns_ownership;
     break;
   case 22:
     if (!memcmp(Str, "no_instrument_function", 22))

Modified: cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp?rev=70975&r1=70974&r2=70975&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Sema/SemaDeclAttr.cpp Tue May  5 10:04:13 2009
@@ -1552,7 +1552,7 @@
 
   if (!isa<ObjCMethodDecl>(d) && !isa<FunctionDecl>(d)) {
     S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type) <<
-      "ns_ownership_returns" << 3 /* function or method */;
+      "ns_returns_ownership" << 3 /* function or method */;
     return;
   }
   
@@ -1644,7 +1644,7 @@
   case AttributeList::AT_ns_ownership_release:
   case AttributeList::AT_ns_ownership_retain:
       HandleNSOwnershipAttr(D, Attr, S, true); break;
-  case AttributeList::AT_ns_ownership_returns:
+  case AttributeList::AT_ns_returns_ownership:
     HandleNSOwnershipReturnsAttr(D, Attr, S); break;
 
   case AttributeList::AT_packed:      HandlePackedAttr    (D, Attr, S); break;

Modified: cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m?rev=70975&r1=70974&r2=70975&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m (original)
+++ cfe/branches/Apple/Dib/test/Analysis/retain-release-gc-only.m Tue May  5 10:04:13 2009
@@ -129,7 +129,7 @@
 //===----------------------------------------------------------------------===//
 
 @interface TestOwnershipAttr : NSObject
-- (NSString*) returnsAnOwnedString __attribute__((ns_ownership_returns));
+- (NSString*) returnsAnOwnedString __attribute__((ns_returns_ownership));
 - (void) myRetain:(id)__attribute__((ns_ownership_retain))obj;
 - (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj;
 - (void) myRelease:(id)__attribute__((ns_ownership_release))obj;

Modified: cfe/branches/Apple/Dib/test/Analysis/retain-release.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/Analysis/retain-release.m?rev=70975&r1=70974&r2=70975&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/test/Analysis/retain-release.m (original)
+++ cfe/branches/Apple/Dib/test/Analysis/retain-release.m Tue May  5 10:04:13 2009
@@ -431,7 +431,7 @@
 //===----------------------------------------------------------------------===//
 
 @interface TestOwnershipAttr : NSObject
-- (NSString*) returnsAnOwnedString  __attribute__((ns_ownership_returns));
+- (NSString*) returnsAnOwnedString  __attribute__((ns_returns_ownership));
 - (void) myRetain:(id)__attribute__((ns_ownership_retain))obj;
 - (void) myCFRetain:(id)__attribute__((cf_ownership_retain))obj;
 - (void) myRelease:(id)__attribute__((ns_ownership_release))obj;
@@ -443,7 +443,7 @@
 
 @interface TestAttrHelper : NSObject
 - (NSString*) createString:(TestOwnershipAttr*)X;
-- (NSString*) createStringAttr:(TestOwnershipAttr*)X __attribute__((ns_ownership_returns));
+- (NSString*) createStringAttr:(TestOwnershipAttr*)X __attribute__((ns_returns_ownership));
 @end
 
 @implementation TestAttrHelper