Hook up Sema support for attributes on Objective-C method declarations that
appear between the return type and the selector. This is a separate code path
from regular attribute processing, as we only want to (a) accept only a specific
set of attributes in this place and (b) want to distinguish to clients the
context in which an attribute was added to an ObjCMethodDecl.
Currently, the attribute 'objc_ownership_returns' is the only attribute that
uses this new feature. Shortly I will add a warning for 'objc_ownership_returns'
to be placed at the end of a method declaration.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70504 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index d04394d..e474637 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1071,6 +1071,9 @@
// Decl attributes - this routine is the top level dispatcher.
void ProcessDeclAttributes(Decl *D, const Declarator &PD);
void ProcessDeclAttributeList(Decl *D, const AttributeList *AttrList);
+
+ void ProcessObjCMethDeclReturnAttributeList(ObjCMethodDecl *D,
+ const AttributeList *AttrList);
void WarnUndefinedMethod(SourceLocation ImpLoc, ObjCMethodDecl *method,
bool &IncompleteImpl);
@@ -2186,6 +2189,7 @@
// from the Sel.getNumArgs().
ObjCArgInfo *ArgInfo,
llvm::SmallVectorImpl<Declarator> &Cdecls,
+ AttributeList *ReturnAttrList,
AttributeList *AttrList, tok::ObjCKeywordKind MethodImplKind,
bool isVariadic = false);
diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index df4fd4d..4853028 100644
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -1697,7 +1697,6 @@
}
}
-
/// ProcessDeclAttributes - Given a declarator (PD) with attributes indicated in
/// it, apply them to D. This is a bit tricky because PD can have attributes
/// specified in many different places, and we need to find and apply them all.
@@ -1719,3 +1718,36 @@
ProcessDeclAttributeList(D, Attrs);
}
+
+/// ProcessObjCMethDeclReturnAttribute - Apply the specific attribute to the
+/// specified ObjCMethodDecl. This is a separate codepath because it
+/// corresponds to attributes applied essentially to the return type of
+/// an Objective-C method declaration (as opposed to attributes that hang off
+/// the end of the method declaration).
+static void ProcessObjCMethDeclReturnAttribute(Decl *D,
+ const AttributeList &Attr,
+ Sema &S) {
+ switch (Attr.getKind()) {
+ // Checker-specific.
+ case AttributeList::AT_objc_ownership_returns:
+ HandleObjCOwnershipReturnsAttr(D, Attr, S); break;
+ break;
+ default:
+ S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
+ break;
+ }
+}
+
+/// ProcessObjCMethDeclAttributeList - Apply all the decl attributes in the
+/// specified attribute list to the specified ObjCMethodDecl. This is
+/// a separate codepath because it corresponds to attributes applied
+/// essentiallyto the return type of an Objective-C method declaration
+/// (as opposed to attributes that hang off the end of the method declaration).
+void Sema::ProcessObjCMethDeclReturnAttributeList(ObjCMethodDecl *D,
+ const AttributeList *AttrList)
+{
+ while (AttrList) {
+ ProcessObjCMethDeclReturnAttribute(D, *AttrList, *this);
+ AttrList = AttrList->getNext();
+ }
+}
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 170efec..61f62cd 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1509,6 +1509,7 @@
// from the Sel.getNumArgs().
ObjCArgInfo *ArgInfo,
llvm::SmallVectorImpl<Declarator> &Cdecls,
+ AttributeList *ReturnAttrList,
AttributeList *AttrList, tok::ObjCKeywordKind MethodDeclKind,
bool isVariadic) {
Decl *ClassDecl = classDecl.getAs<Decl>();
@@ -1590,6 +1591,9 @@
if (AttrList)
ProcessDeclAttributeList(ObjCMethod, AttrList);
+
+ if (ReturnAttrList)
+ ProcessObjCMethDeclReturnAttributeList(ObjCMethod, ReturnAttrList);
// For implementations (which can be very "coarse grain"), we add the
// method now. This allows the AST to implement lookup methods that work