[cfe-commits] r70001 - in /cfe/trunk: include/clang/AST/Attr.h include/clang/Parse/AttributeList.h lib/Frontend/PCHReader.cpp lib/Frontend/PCHWriter.cpp lib/Parse/AttributeList.cpp lib/Sema/SemaDeclAttr.cpp test/Analysis/retain-release.m
Ted Kremenek
kremenek at apple.com
Fri Apr 24 16:09:54 PDT 2009
Author: kremenek
Date: Fri Apr 24 18:09:54 2009
New Revision: 70001
URL: http://llvm.org/viewvc/llvm-project?rev=70001&view=rev
Log:
Add new checker-specific attribute 'objc_ownership_returns'. This isn't hooked
up to the checker yet, but essentially it allows a user to specify that an
Objective-C method or C function returns an owned an Objective-C object.
Modified:
cfe/trunk/include/clang/AST/Attr.h
cfe/trunk/include/clang/Parse/AttributeList.h
cfe/trunk/lib/Frontend/PCHReader.cpp
cfe/trunk/lib/Frontend/PCHWriter.cpp
cfe/trunk/lib/Parse/AttributeList.cpp
cfe/trunk/lib/Sema/SemaDeclAttr.cpp
cfe/trunk/test/Analysis/retain-release.m
Modified: cfe/trunk/include/clang/AST/Attr.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Attr.h?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Attr.h (original)
+++ cfe/trunk/include/clang/AST/Attr.h Fri Apr 24 18:09:54 2009
@@ -51,6 +51,7 @@
NonNull,
ObjCException,
ObjCNSObject,
+ ObjCOwnershipReturns, // Clang/Checker-specific.
Overloadable, // Clang-specific
Packed,
Pure,
@@ -587,6 +588,21 @@
static bool classof(const Attr *A) { return A->getKind() == Regparm; }
static bool classof(const RegparmAttr *A) { return true; }
};
+
+
+#define DEF_SIMPLE_ATTR(ATTR)\
+class ATTR##Attr : public Attr {\
+public:\
+ ATTR##Attr() : Attr(ATTR) {}\
+ static bool classof(const Attr *A) { return A->getKind() == ATTR; }\
+ static bool classof(const ATTR##Attr *A) { return true; }\
+};
+
+// Checker-specific attributes.
+DEF_SIMPLE_ATTR(ObjCOwnershipReturns)
+
+#undef DEF_SIMPLE_ATTR
+
} // end namespace clang
#endif
Modified: cfe/trunk/include/clang/Parse/AttributeList.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Parse/AttributeList.h?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/include/clang/Parse/AttributeList.h (original)
+++ cfe/trunk/include/clang/Parse/AttributeList.h Fri Apr 24 18:09:54 2009
@@ -75,8 +75,9 @@
AT_nothrow,
AT_nsobject,
AT_objc_exception,
+ AT_objc_ownership_returns, // Clang-specific.
AT_objc_gc,
- AT_overloadable, // Clang-specific
+ AT_overloadable, // Clang-specific.
AT_packed,
AT_pure,
AT_regparm,
Modified: cfe/trunk/lib/Frontend/PCHReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHReader.cpp?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHReader.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHReader.cpp Fri Apr 24 18:09:54 2009
@@ -3045,6 +3045,7 @@
SIMPLE_ATTR(ObjCException);
SIMPLE_ATTR(ObjCNSObject);
+ SIMPLE_ATTR(ObjCOwnershipReturns);
SIMPLE_ATTR(Overloadable);
UNSIGNED_ATTR(Packed);
SIMPLE_ATTR(Pure);
Modified: cfe/trunk/lib/Frontend/PCHWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHWriter.cpp?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHWriter.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHWriter.cpp Fri Apr 24 18:09:54 2009
@@ -2181,6 +2181,7 @@
case Attr::ObjCException:
case Attr::ObjCNSObject:
+ case Attr::ObjCOwnershipReturns:
case Attr::Overloadable:
break;
Modified: cfe/trunk/lib/Parse/AttributeList.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/AttributeList.cpp?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/AttributeList.cpp (original)
+++ cfe/trunk/lib/Parse/AttributeList.cpp Fri Apr 24 18:09:54 2009
@@ -133,6 +133,10 @@
case 18:
if (!memcmp(Str, "warn_unused_result", 18)) return AT_warn_unused_result;
break;
+ case 22:
+ if (!memcmp(Str, "objc_ownership_returns", 22))
+ return AT_objc_ownership_returns;
+ break;
}
return UnknownAttribute;
}
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Fri Apr 24 18:09:54 2009
@@ -1518,6 +1518,22 @@
}
//===----------------------------------------------------------------------===//
+// Checker-specific attribute handlers.
+//===----------------------------------------------------------------------===//
+
+static void HandleObjCOwnershipReturnsAttr(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 */;
+ return;
+ }
+
+ d->addAttr(::new (S.Context) ObjCOwnershipReturnsAttr());
+}
+
+//===----------------------------------------------------------------------===//
// Top Level Sema Entry Points
//===----------------------------------------------------------------------===//
@@ -1553,6 +1569,11 @@
case AttributeList::AT_nonnull: HandleNonNullAttr (D, Attr, S); break;
case AttributeList::AT_noreturn: HandleNoReturnAttr (D, Attr, S); break;
case AttributeList::AT_nothrow: HandleNothrowAttr (D, Attr, S); break;
+
+ // Checker-specific.
+ case AttributeList::AT_objc_ownership_returns:
+ HandleObjCOwnershipReturnsAttr(D, Attr, S); break;
+
case AttributeList::AT_packed: HandlePackedAttr (D, Attr, S); break;
case AttributeList::AT_section: HandleSectionAttr (D, Attr, S); break;
case AttributeList::AT_stdcall: HandleStdCallAttr (D, Attr, S); break;
Modified: cfe/trunk/test/Analysis/retain-release.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/retain-release.m?rev=70001&r1=70000&r2=70001&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/retain-release.m (original)
+++ cfe/trunk/test/Analysis/retain-release.m Fri Apr 24 18:09:54 2009
@@ -405,3 +405,15 @@
}
}
+//===----------------------------------------------------------------------===//
+// Tests of ownership attributes.
+//===----------------------------------------------------------------------===//
+
+ at interface TestOwnershipAttr : NSObject
+- (NSString*) returnsAnOwnedString __attribute__((objc_ownership_returns));
+ at end
+
+void test_attr_1(TestOwnershipAttr *X) {
+ NSString *str = [X returnsAnOwnedString];
+}
+
More information about the cfe-commits
mailing list