[AST] Look through attribute type locs when searching for function type

loc

Prior to this commit -Wdocumentation crashed when checking the @returns command
for declarations whose function/block pointer type included an attribute like
_Nullable.

rdar://31818195

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@301400 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/Comment.cpp b/lib/AST/Comment.cpp
index 20ff2430df2e826252e91011f130f35579645271..dfa2a1665d40fd15f8cf6b1ca3962315e88eb40e 100644 (file)
--- a/lib/AST/Comment.cpp
+++ b/lib/AST/Comment.cpp
@@ -116,6 +116,9 @@ bool ParagraphComment::isWhitespaceNoCache() const {
 static TypeLoc lookThroughTypedefOrTypeAliasLocs(TypeLoc &SrcTL) {
   TypeLoc TL = SrcTL.IgnoreParens();
 
+  // Look through attribute types.
+  if (AttributedTypeLoc AttributeTL = TL.getAs<AttributedTypeLoc>())
+    return AttributeTL.getModifiedLoc();
   // Look through qualified types.
   if (QualifiedTypeLoc QualifiedTL = TL.getAs<QualifiedTypeLoc>())
     return QualifiedTL.getUnqualifiedLoc();

diff --git a/test/Sema/warn-documentation.m b/test/Sema/warn-documentation.m
index a8538f02be1bd6f749e77772d761b427d7a5c283..98336f9fa283527b24167ddbc7ba1bd9a39bc7a3 100644 (file)
--- a/test/Sema/warn-documentation.m
+++ b/test/Sema/warn-documentation.m
@@ -254,7 +254,7 @@ struct HasFields {
  * \param p not here.
  * \returns integer.
  */
-void (^blockPointerVariableThatLeadsNowhere)();
+void (^_Nullable blockPointerVariableThatLeadsNowhere)();
 
 @interface CheckFunctionBlockPointerVars {
   /**